Changed the abstract columns and datalists from test cases of common and Identity

columns and datalist has been set in each test case in compute,
which is not necessary. This patch abstract it out and remove
all redundant code.

Change-Id: I45a3582088161f12e60e7c933da8e7dcc0ae8e7b
Closes-Bug: #1532384

1 files changed, 27 insertions, 64 deletions

diff --git a/openstackclient/tests/identity/v2_0/test_project.py b/openstackclient/tests/identity/v2_0/test_project.py
index 16ab1957..78e5dff7 100644
--- a/openstackclient/tests/identity/v2_0/test_project.py
+++ b/openstackclient/tests/identity/v2_0/test_project.py
@@ -34,6 +34,19 @@ class TestProject(identity_fakes.TestIdentityv2):
 
 class TestProjectCreate(TestProject):
 
+    columns = (
+        'description',
+        'enabled',
+        'id',
+        'name',
+    )
+    datalist = (
+        identity_fakes.project_description,
+        True,
+        identity_fakes.project_id,
+        identity_fakes.project_name,
+    )
+
     def setUp(self):
         super(TestProjectCreate, self).setUp()
 
@@ -69,16 +82,8 @@ class TestProjectCreate(TestProject):
             identity_fakes.project_name,
             **kwargs
         )
-
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_description(self):
         arglist = [
@@ -104,15 +109,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_enable(self):
         arglist = [
@@ -139,15 +137,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_disable(self):
         arglist = [
@@ -174,15 +165,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_property(self):
         arglist = [
@@ -211,15 +195,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_or_show_exists(self):
         def _raise_conflict(*args, **kwargs):
@@ -260,15 +237,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_project_create_or_show_not_exists(self):
         arglist = [
@@ -294,15 +264,8 @@ class TestProjectCreate(TestProject):
             **kwargs
         )
 
-        collist = ('description', 'enabled', 'id', 'name')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.project_description,
-            True,
-            identity_fakes.project_id,
-            identity_fakes.project_name,
-        )
-        self.assertEqual(datalist, data)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
 
 class TestProjectDelete(TestProject):