diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-14 16:33:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-14 16:33:16 +0000 |
| commit | 8654e3e366166372c8f114ad9463dbceb599cd3d (patch) | |
| tree | b7577cc9e96d5bf7ec82e9d0ef55df71c2a17912 /openstackclient/tests/common/test_configuration.py | |
| parent | fa3077d51a77b4244c2b9655e28c06d208c80114 (diff) | |
| parent | 030aee6fbcca6be97dd898e8c1b4c05021832bbd (diff) | |
| download | python-openstackclient-8654e3e366166372c8f114ad9463dbceb599cd3d.tar.gz | |
Merge "Changed the abstract columns and datalists from test cases of common and Identity"
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) |