Merge "Improve prep_resize reschedule unit test"

Author: Zuul

nova/tests/unit/compute/test_compute_mgr.py

@@ -10644,6 +10644,7 @@ def doit(mock_pr, mock_r):
             self._mock_rt().reportclient = reportclient
             mock_pr.side_effect = test.TestingException
             mock_r.side_effect = test.TestingException
+            request_spec = objects.RequestSpec()
 
             instance = objects.Instance(uuid=uuids.instance,
                                         id=1,
@@ -10656,7 +10657,7 @@ def doit(mock_pr, mock_r):
                               self.compute.prep_resize,
                               self.context, mock.sentinel.image,
                               instance, flavor,
-                              mock.sentinel.request_spec,
+                              request_spec,
                               {}, 'node', False,
                               migration, [])
 
@@ -10666,7 +10667,11 @@ def doit(mock_pr, mock_r):
             migration.save.assert_called_once_with()
             mock_r.assert_called_once_with(
                 self.context, instance, mock.ANY, flavor,
-                mock.sentinel.request_spec, {}, [])
+                request_spec, {}, [])
+            mock_pr.assert_called_once_with(
+                self.context, mock.sentinel.image,
+                instance, flavor, {}, 'node', migration,
+                request_spec, False)
             mock_notify_resize.assert_has_calls([
                 mock.call(self.context, instance, 'fake-mini',
                           'start', flavor),