diff options
| author | termie <github@anarkystic.com> | 2012-01-31 15:45:00 -0800 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2012-02-01 15:41:16 -0800 |
| commit | c6e30eb5a1b14816e06589c407ea81f6d63b5355 (patch) | |
| tree | 11a3c33c24539ebe397262286be8aa4f42414f5b | |
| parent | 2d2ce8c72efa965b6db4affe1a5d9e3e6ca5d47b (diff) | |
| download | keystone-c6e30eb5a1b14816e06589c407ea81f6d63b5355.tar.gz keystone-c6e30eb5a1b14816e06589c407ea81f6d63b5355.tar.xz keystone-c6e30eb5a1b14816e06589c407ea81f6d63b5355.zip | |
add tests for essex and fix the testing framework
| -rw-r--r-- | keystone/test.py | 5 | ||||
| -rw-r--r-- | tests/test_keystoneclient.py | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/keystone/test.py b/keystone/test.py index 42655142..9f2773f7 100644 --- a/keystone/test.py +++ b/keystone/test.py @@ -197,6 +197,11 @@ class TestCase(unittest.TestCase): sys.path.insert(0, path) self._paths.append(path) + def clear_module(self, module): + for x in sys.modules.keys(): + if x.startswith(module): + del sys.modules[x] + def assertListEquals(self, actual, expected): copy = expected[:] #print expected, actual diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py index d7748649..49873e1d 100644 --- a/tests/test_keystoneclient.py +++ b/tests/test_keystoneclient.py @@ -41,10 +41,9 @@ class KcMasterTestCase(CompatTestCase): def setUp(self): super(KcMasterTestCase, self).setUp() - revdir = test.checkout_vendor(KEYSTONECLIENT_REPO, 'master') + revdir = test.checkout_vendor(*self.get_checkout()) self.add_path(revdir) - from keystoneclient.v2_0 import client as ks_client - reload(ks_client) + self.clear_module('keystoneclient') self.public_app = self.loadapp('keystone', name='main') self.admin_app = self.loadapp('keystone', name='admin') @@ -63,6 +62,9 @@ class KcMasterTestCase(CompatTestCase): self.user_foo['id'], self.tenant_bar['id'], dict(roles=['keystone_admin'], is_admin='1')) + def get_checkout(self): + return KEYSTONECLIENT_REPO, 'master' + def get_client(self, user_ref=None, tenant_ref=None): if user_ref is None: user_ref = self.user_foo @@ -429,3 +431,8 @@ class KcMasterTestCase(CompatTestCase): # TODO(ja): MEMBERSHIP CRUD # TODO(ja): determine what else todo + + +class KcEssex3TestCase(KcMasterTestCase): + def get_checkout(self): + return KEYSTONECLIENT_REPO, 'essex-3' |