Python-2.6 compatibility for tests/test_keyring.py

TestCase.setUpClass() and unittest.SkipTest are features added in 2.7.
Calling super(KeyringTest, cls).setUpClass() could have never worked
since tests.utils.TestCase doesn't implement that (class) method.

Change-Id: Ifbb0465be24fd13ad68d52c0d7fa4c5090d0f694
This commit is contained in:
Sascha Peilicke
2013-06-17 12:13:19 +02:00
parent 1e3cf4bb2f
commit f3834c2ed1

View File

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