diff --git a/nova/tests/unit/virt/gce/test_gce.py b/nova/tests/unit/virt/gce/test_gce.py index 3fb1db6..ea59223 100644 --- a/nova/tests/unit/virt/gce/test_gce.py +++ b/nova/tests/unit/virt/gce/test_gce.py @@ -137,7 +137,9 @@ class GCENovaTestCase(test.TestCase): network_info=[]) mock_wait.assert_called_once_with(self._driver.gce_svc, self._driver.gce_project, - gce_mock.fake_operation()) + gce_mock.fake_operation(), + interval=5, + timeout=300) @mock.patch('nova.virt.gce.driver.gceutils.wait_for_operation') @mock.patch('nova.virt.gce.driver.gceutils.attach_disk') diff --git a/nova/virt/gce/driver.py b/nova/virt/gce/driver.py index 177b5a0..0dc89b0 100644 --- a/nova/virt/gce/driver.py +++ b/nova/virt/gce/driver.py @@ -598,7 +598,8 @@ class GCEDriver(driver.ComputeDriver): LOG.error("Instance {0} not found in GCE, removing from openstack." .format(instance.uuid)) return - gceutils.wait_for_operation(compute, project, operation) + gceutils.wait_for_operation(compute, project, operation, + interval=5, timeout=300) LOG.info("Destroy Complete %s" % instance.uuid) def attach_volume(self, context, connection_info, instance, mountpoint,