diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-16 20:52:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-16 20:52:07 +0000 |
| commit | ee62718dc8585f3260ca89886d7bf8546931053a (patch) | |
| tree | 8485be67a785121e65254dd97c3b35e3a6cd572f /openstackclient/tests | |
| parent | 655b76f649daba7d33823ce1955f572fc9df36f4 (diff) | |
| parent | c2c3f2e0f23f857aa2c8ce17e310996e90ea9b54 (diff) | |
| download | python-openstackclient-ee62718dc8585f3260ca89886d7bf8546931053a.tar.gz | |
Merge "Update service clist commands for v2 and v3"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_service.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v3/test_service.py | 26 |
2 files changed, 27 insertions, 2 deletions
diff --git a/openstackclient/tests/identity/v2_0/test_service.py b/openstackclient/tests/identity/v2_0/test_service.py index a0adea4e..73606585 100644 --- a/openstackclient/tests/identity/v2_0/test_service.py +++ b/openstackclient/tests/identity/v2_0/test_service.py @@ -235,11 +235,12 @@ class TestServiceList(TestService): self.services_mock.list.assert_called_with() - collist = ('ID', 'Name') + collist = ('ID', 'Name', 'Type') self.assertEqual(columns, collist) datalist = (( identity_fakes.service_id, identity_fakes.service_name, + identity_fakes.service_type, ), ) self.assertEqual(tuple(data), datalist) diff --git a/openstackclient/tests/identity/v3/test_service.py b/openstackclient/tests/identity/v3/test_service.py index 5e4dc585..7766a29c 100644 --- a/openstackclient/tests/identity/v3/test_service.py +++ b/openstackclient/tests/identity/v3/test_service.py @@ -247,12 +247,36 @@ class TestServiceList(TestService): self.services_mock.list.assert_called_with() - collist = ('ID', 'Name', 'Type', 'Enabled') + collist = ('ID', 'Name', 'Type') self.assertEqual(columns, collist) datalist = (( identity_fakes.service_id, identity_fakes.service_name, identity_fakes.service_type, + ), ) + self.assertEqual(tuple(data), datalist) + + def test_service_list_long(self): + arglist = [ + '--long', + ] + verifylist = [ + ('long', True), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + columns, data = self.cmd.take_action(parsed_args) + + self.services_mock.list.assert_called_with() + + collist = ('ID', 'Name', 'Type', 'Description', 'Enabled') + self.assertEqual(columns, collist) + datalist = (( + identity_fakes.service_id, + identity_fakes.service_name, + identity_fakes.service_type, + identity_fakes.service_description, True, ), ) self.assertEqual(tuple(data), datalist) |