Merge "Add testcase for coverage of 002_add_endpoint_groups"

1 files changed, 31 insertions, 5 deletions

diff --git a/keystone/tests/test_sql_migrate_extensions.py b/keystone/tests/test_sql_migrate_extensions.py
index aff58dacf..599d1917c 100644
--- a/keystone/tests/test_sql_migrate_extensions.py
+++ b/keystone/tests/test_sql_migrate_extensions.py
@@ -151,17 +151,43 @@ class EndpointFilterExtension(test_sql_upgrade.SqlMigrateBase):
     def repo_package(self):
         return endpoint_filter
 
+    def upgrade(self, version):
+        super(EndpointFilterExtension, self).upgrade(
+            version, repository=self.repo_path)
+
+    def downgrade(self, version):
+        super(EndpointFilterExtension, self).downgrade(
+            version, repository=self.repo_path)
+
+    def _assert_v1_tables(self):
+        self.assertTableColumns('project_endpoint',
+                                ['endpoint_id', 'project_id'])
+        self.assertTableDoesNotExist('endpoint_group')
+        self.assertTableDoesNotExist('project_endpoint_group')
+
+    def _assert_v2_tables(self):
+        self.assertTableColumns('project_endpoint',
+                                ['endpoint_id', 'project_id'])
+        self.assertTableColumns('endpoint_group',
+                                ['id', 'name', 'description', 'filters'])
+        self.assertTableColumns('project_endpoint_group',
+                                ['endpoint_group_id', 'project_id'])
+
     def test_upgrade(self):
         self.assertTableDoesNotExist('project_endpoint')
-        self.upgrade(1, repository=self.repo_path)
+        self.upgrade(1)
+        self._assert_v1_tables()
         self.assertTableColumns('project_endpoint',
                                 ['endpoint_id', 'project_id'])
+        self.upgrade(2)
+        self._assert_v2_tables()
 
     def test_downgrade(self):
-        self.upgrade(1, repository=self.repo_path)
-        self.assertTableColumns('project_endpoint',
-                                ['endpoint_id', 'project_id'])
-        self.downgrade(0, repository=self.repo_path)
+        self.upgrade(2)
+        self._assert_v2_tables()
+        self.downgrade(1)
+        self._assert_v1_tables()
+        self.downgrade(0)
         self.assertTableDoesNotExist('project_endpoint')