Fix wrong assertions in unit tests

Change-Id: I54dff4d5ed513690d0fae65de47a1a9c23aebbd4
Closes-Bug: #1840601
(cherry picked from commit 8ea5e37)

Author: natsumetakashi

nova/tests/unit/cmd/test_baseproxy.py

@@ -63,7 +63,7 @@ def test_proxy(self, mock_start, mock_init, mock_gmr, mock_log,
                    mock_exists):
         baseproxy.proxy('0.0.0.0', '6080')
         mock_log.assert_called_once_with(baseproxy.CONF, 'nova')
-        mock_gmr.mock_assert_called_once_with(version)
+        mock_gmr.assert_called_once_with(version, conf=baseproxy.CONF)
         mock_init.assert_called_once_with(
             listen_host='0.0.0.0', listen_port='6080', source_is_ipv6=False,
             cert='self.pem', key=None, ssl_only=False,

nova/tests/unit/virt/ironic/test_driver.py

@@ -1919,9 +1919,10 @@ def test_power_off_soft_exception(self, mock_sp, fake_validate):
         mock_sp.side_effect = [ironic_exception.BadRequest(), None]
 
         self._test_power_off(timeout=30)
-        mock_sp.assert_has_calls([mock.call(node.uuid, 'off', soft=True,
-                                            timeout=30).
-                                  mock.call(node.uuid, 'off')])
+        expected_calls = [mock.call(node.uuid, 'off', soft=True, timeout=30),
+                          mock.call(node.uuid, 'off')]
+        self.assertEqual(len(expected_calls), mock_sp.call_count)
+        mock_sp.assert_has_calls(expected_calls)
 
     @mock.patch.object(ironic_driver.IronicDriver,
                        '_validate_instance_and_node')
@@ -1931,9 +1932,10 @@ def test_power_off_soft_not_stopped(self, mock_sp, fake_validate):
         fake_validate.side_effect = [node, node]
 
         self._test_power_off(timeout=30)
-        mock_sp.assert_has_calls([mock.call(node.uuid, 'off', soft=True,
-                                            timeout=30).
-                                  mock.call(node.uuid, 'off')])
+        expected_calls = [mock.call(node.uuid, 'off', soft=True, timeout=30),
+                          mock.call(node.uuid, 'off')]
+        self.assertEqual(len(expected_calls), mock_sp.call_count)
+        mock_sp.assert_has_calls(expected_calls)
 
     @mock.patch.object(FAKE_CLIENT.node, 'vif_attach')
     def test_plug_vifs_with_port(self, mock_vatt):

nova/tests/unit/virt/vmwareapi/test_vmops.py

@@ -2830,15 +2830,16 @@ def test_attach_interface(self, mock_get_vm_ref,
         self._vmops.attach_interface(self._context, self._instance,
                                      self._image_meta, self._network_values)
         mock_get_vm_ref.assert_called_once_with(self._session, self._instance)
-        mock_get_attach_port_index(self._session, 'fake-ref')
+        mock_get_attach_port_index.assert_called_once_with(self._session,
+                                                           'fake-ref')
         mock_get_network_attach_config_spec.assert_called_once_with(
             self._session.vim.client.factory, vif_info, 1,
             extra_specs.vif_limits)
         mock_reconfigure_vm.assert_called_once_with(self._session,
                                                     'fake-ref',
                                                     'fake-attach-spec')
-        _network_api.update_instance_vnic_index(mock.ANY,
-            self._instance, self._network_values, 1)
+        _network_api.update_instance_vnic_index.assert_called_once_with(
+            mock.ANY, self._instance, self._network_values, 1)
 
     @mock.patch.object(vif, 'get_network_device', return_value='device')
     @mock.patch.object(vm_util, 'reconfigure_vm')
@@ -2859,14 +2860,15 @@ def test_detach_interface(self, mock_get_vm_ref,
             self._vmops.detach_interface(self._context, self._instance,
                                          self._network_values)
         mock_get_vm_ref.assert_called_once_with(self._session, self._instance)
-        mock_get_detach_port_index(self._session, 'fake-ref')
+        mock_get_detach_port_index.assert_called_once_with(self._session,
+                                                           'fake-ref', None)
         mock_get_network_detach_config_spec.assert_called_once_with(
             self._session.vim.client.factory, 'device', 1)
         mock_reconfigure_vm.assert_called_once_with(self._session,
                                                     'fake-ref',
                                                     'fake-detach-spec')
-        _network_api.update_instance_vnic_index(mock.ANY,
-            self._instance, self._network_values, None)
+        _network_api.update_instance_vnic_index.assert_called_once_with(
+            mock.ANY, self._instance, self._network_values, None)
 
     @mock.patch.object(vm_util, 'get_vm_ref', return_value='fake-ref')
     def test_get_mks_console(self, mock_get_vm_ref):
@@ -2937,12 +2939,13 @@ def test_attach_interface_with_limits(self, mock_get_vm_ref,
                                      self._image_meta,
                                      self._network_values)
         mock_get_vm_ref.assert_called_once_with(self._session, self._instance)
-        mock_get_attach_port_index(self._session, 'fake-ref')
+        mock_get_attach_port_index.assert_called_once_with(self._session,
+                                                           'fake-ref')
         mock_get_network_attach_config_spec.assert_called_once_with(
             self._session.vim.client.factory, vif_info, 1,
             extra_specs.vif_limits)
         mock_reconfigure_vm.assert_called_once_with(self._session,
                                                     'fake-ref',
                                                     'fake-attach-spec')
-        _network_api.update_instance_vnic_index(mock.ANY,
-            self._instance, self._network_values, 1)
+        _network_api.update_instance_vnic_index.assert_called_once_with(
+            mock.ANY, self._instance, self._network_values, 1)