openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Python-2.6 compatibility for tests/test_keyring.py"

Browse Source
This commit is contained in:
Jenkins
2013-06-23 16:20:39 +00:00
committed by Gerrit Code Review
parent 2239c3b27c f3834c2ed1
commit 3056f33a1d
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_keyring.py
View File

@@ -1,5 +1,4 @@
import datetime import datetime
import unittest
from keystoneclient import access from keystoneclient import access
from keystoneclient import client from keystoneclient import client
@@ -27,15 +26,11 @@ TENANT_ID = 'tenant_id'
class KeyringTest(utils.TestCase): class KeyringTest(utils.TestCase):
@classmethod def setUp(self):
def setUpClass(cls):
super(KeyringTest, cls).setUpClass()
if keyring is None: if keyring is None:
raise unittest.SkipTest( self.skipTest(
'optional package keyring or pickle is not installed') 'optional package keyring or pickle is not installed')
def setUp(self):
class MemoryKeyring(keyring.backend.KeyringBackend): class MemoryKeyring(keyring.backend.KeyringBackend):
"""Simple memory keyring with support for multiple keys""" """Simple memory keyring with support for multiple keys"""
def __init__(self): def __init__(self):