diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-06-23 16:20:39 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-06-23 16:20:39 +0000 |
commit | 3056f33a1de4967e853dd49df3a89b6d4a200dea (patch) | |
tree | 394d2ead3fa318a4235e033f817f83fe41c85d29 | |
parent | 2239c3b27c657dc0ffe2dbd0f95325e0ed7ae7c5 (diff) | |
parent | f3834c2ed1a6eeb409bf8031a0984048bb105d95 (diff) | |
download | python-keystoneclient-3056f33a1de4967e853dd49df3a89b6d4a200dea.tar.gz |
Merge "Python-2.6 compatibility for tests/test_keyring.py"0.3.0
-rw-r--r-- | tests/test_keyring.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/test_keyring.py b/tests/test_keyring.py index 8aaa667..f3eba82 100644 --- a/tests/test_keyring.py +++ b/tests/test_keyring.py @@ -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): |