diff options
| author | SaiKiran <saikiranveeravarapu@gmail.com> | 2016-01-09 11:39:01 +0530 |
|---|---|---|
| committer | SaiKiran <saikiranveeravarapu@gmail.com> | 2016-01-12 17:25:33 +0530 |
| commit | 030aee6fbcca6be97dd898e8c1b4c05021832bbd (patch) | |
| tree | 783ee9df97851c568e82d15e35805313a3e847ad /openstackclient/tests/common/test_configuration.py | |
| parent | a080227b07fc533ca782dd08c4bb17cdf3450bc5 (diff) | |
| download | python-openstackclient-030aee6fbcca6be97dd898e8c1b4c05021832bbd.tar.gz | |
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
Diffstat (limited to 'openstackclient/tests/common/test_configuration.py')
| -rw-r--r-- | openstackclient/tests/common/test_configuration.py | 47 |
1 files changed, 21 insertions, 26 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) |