add tests for essex and fix the testing framework

1 files changed, 10 insertions, 3 deletions

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'