Merge "Fix 'mapping set' return value"

Jenkins · openstack-gerrit · commit dec06aa89a22 · 2017-01-25T22:27:31.000Z
diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py
@@ -183,7 +183,6 @@ def take_action(self, parsed_args):
             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
@@ -181,16 +181,12 @@ def test_set_new_rules(self):
         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 = [
