diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-25 22:27:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-25 22:27:31 +0000 |
| commit | dec06aa89a22c1f57e19eb2882f22e5e607bf5ee (patch) | |
| tree | d7995a081d92dde1a3ad53a33b309eb906c0e3da /openstackclient | |
| parent | e3f9ef956f87e237c63b4ab2e3533c8fd334f038 (diff) | |
| parent | 365d839a5b4e685d9a12f81386ddfaab07c56d83 (diff) | |
| download | python-openstackclient-dec06aa89a22c1f57e19eb2882f22e5e607bf5ee.tar.gz | |
Merge "Fix 'mapping set' return value"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v3/mapping.py | 1 | ||||
| -rw-r--r-- | openstackclient/tests/unit/identity/v3/test_mappings.py | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py index dbb1b068..28080f89 100644 --- a/openstackclient/identity/v3/mapping.py +++ b/openstackclient/identity/v3/mapping.py @@ -183,7 +183,6 @@ class SetMapping(command.Command, _RulesReader): rules=rules) mapping._info.pop('links', None) - return zip(*sorted(six.iteritems(mapping._info))) class ShowMapping(command.ShowOne): diff --git a/openstackclient/tests/unit/identity/v3/test_mappings.py b/openstackclient/tests/unit/identity/v3/test_mappings.py index 5086724c..93fe1196 100644 --- a/openstackclient/tests/unit/identity/v3/test_mappings.py +++ b/openstackclient/tests/unit/identity/v3/test_mappings.py @@ -181,16 +181,12 @@ class TestMappingSet(TestMapping): mocker.return_value = identity_fakes.MAPPING_RULES_2 with mock.patch("openstackclient.identity.v3.mapping." "SetMapping._read_rules", mocker): - columns, data = self.cmd.take_action(parsed_args) + result = self.cmd.take_action(parsed_args) self.mapping_mock.update.assert_called_with( mapping=identity_fakes.mapping_id, rules=identity_fakes.MAPPING_RULES_2) - collist = ('id', 'rules') - self.assertEqual(collist, columns) - datalist = (identity_fakes.mapping_id, - identity_fakes.MAPPING_RULES_2) - self.assertEqual(datalist, data) + self.assertIsNone(result) def test_set_rules_wrong_file_path(self): arglist = [ |