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

3 files changed, 33 insertions, 37 deletions

diff --git a/openstackclient/tests/common/test_configuration.py b/openstackclient/tests/common/test_configuration.py
index 3b942533..e81550ed 100644
--- a/openstackclient/tests/common/test_configuration.py
+++ b/openstackclient/tests/common/test_configuration.py
@@ -18,6 +18,21 @@ from openstackclient.tests import utils
 
 class TestConfiguration(utils.TestCommand):
 
+    columns = (
+        'auth.password',
+        'auth.token',
+        'auth.username',
+        'identity_api_version',
+        'region',
+    )
+    datalist = (
+        configuration.REDACTED,
+        configuration.REDACTED,
+        fakes.USERNAME,
+        fakes.VERSION,
+        fakes.REGION_NAME,
+    )
+
     def test_show(self):
         arglist = []
         verifylist = [('mask', True)]
@@ -26,17 +41,8 @@ class TestConfiguration(utils.TestCommand):
 
         columns, data = cmd.take_action(parsed_args)
 
-        collist = ('auth.password', 'auth.token', 'auth.username',
-                   'identity_api_version', 'region')
-        self.assertEqual(collist, columns)
-        datalist = (
-            configuration.REDACTED,
-            configuration.REDACTED,
-            fakes.USERNAME,
-            fakes.VERSION,
-            fakes.REGION_NAME,
-        )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
 
     def test_show_unmask(self):
         arglist = ['--unmask']
@@ -46,9 +52,7 @@ class TestConfiguration(utils.TestCommand):
 
         columns, data = cmd.take_action(parsed_args)
 
-        collist = ('auth.password', 'auth.token', 'auth.username',
-                   'identity_api_version', 'region')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = (
             fakes.PASSWORD,
             fakes.AUTH_TOKEN,
@@ -56,7 +60,7 @@ class TestConfiguration(utils.TestCommand):
             fakes.VERSION,
             fakes.REGION_NAME,
         )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(datalist, data)
 
     def test_show_mask(self):
         arglist = ['--mask']
@@ -66,14 +70,5 @@ class TestConfiguration(utils.TestCommand):
 
         columns, data = cmd.take_action(parsed_args)
 
-        collist = ('auth.password', 'auth.token', 'auth.username',
-                   'identity_api_version', 'region')
-        self.assertEqual(collist, columns)
-        datalist = (
-            configuration.REDACTED,
-            configuration.REDACTED,
-            fakes.USERNAME,
-            fakes.VERSION,
-            fakes.REGION_NAME,
-        )
-        self.assertEqual(datalist, tuple(data))
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, data)
diff --git a/openstackclient/tests/common/test_extension.py b/openstackclient/tests/common/test_extension.py
index 5f5588a7..21c2cc24 100644
--- a/openstackclient/tests/common/test_extension.py
+++ b/openstackclient/tests/common/test_extension.py
@@ -42,6 +42,8 @@ class TestExtension(utils.TestCommand):
 
 class TestExtensionList(TestExtension):
 
+    columns = ('Name', 'Alias', 'Description')
+
     def setUp(self):
         super(TestExtensionList, self).setUp()
 
@@ -67,8 +69,7 @@ class TestExtensionList(TestExtension):
         # no args should output from all services
         self.identity_extensions_mock.list.assert_called_with()
 
-        collist = ('Name', 'Alias', 'Description')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = (
             (
                 identity_fakes.extension_name,
@@ -135,8 +136,7 @@ class TestExtensionList(TestExtension):
 
         self.identity_extensions_mock.list.assert_called_with()
 
-        collist = ('Name', 'Alias', 'Description')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = ((
             identity_fakes.extension_name,
             identity_fakes.extension_alias,
@@ -157,8 +157,7 @@ class TestExtensionList(TestExtension):
 
         self.network_extensions_mock.assert_called_with()
 
-        collist = ('Name', 'Alias', 'Description')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = (
             (
                 network_fakes.extension_name,
diff --git a/openstackclient/tests/common/test_timing.py b/openstackclient/tests/common/test_timing.py
index a7f93b55..e7b9a040 100644
--- a/openstackclient/tests/common/test_timing.py
+++ b/openstackclient/tests/common/test_timing.py
@@ -33,6 +33,11 @@ class FakeGenericClient(object):
 
 class TestTiming(utils.TestCommand):
 
+    columns = (
+        'URL',
+        'Seconds',
+    )
+
     def setUp(self):
         super(TestTiming, self).setUp()
 
@@ -59,8 +64,7 @@ class TestTiming(utils.TestCommand):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
 
-        collist = ('URL', 'Seconds')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = [
             ('Total', 0.0,)
         ]
@@ -78,9 +82,7 @@ class TestTiming(utils.TestCommand):
 
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
-
-        collist = ('URL', 'Seconds')
-        self.assertEqual(collist, columns)
+        self.assertEqual(self.columns, columns)
         datalist = [
             (timing_url, timing_elapsed),
             ('Total', timing_elapsed),