openstack
/
nova
Code Issues Proposed changes

Merge "Fix invalid raise in test_compute_mgr"

This commit is contained in:
Zuul 2018-06-01 20:56:38 +00:00 committed by Gerrit Code Review
parent 79304c1d15 39a9617f4a
commit bc2854e704
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -5848,7 +5848,7 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
with self.compute._build_resources(self.context, self.instance,
self.requested_networks, self.security_groups,
self.image, self.block_device_mapping):
raise
raise test.TestingException()
except exception.BuildAbortException:
pass
mock_build_network.assert_called_once_with(self.context, self.instance,
@ -5869,7 +5869,7 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
with self.compute._build_resources(self.context, self.instance,
self.requested_networks, self.security_groups,
self.image, self.block_device_mapping):
raise
raise test.TestingException()
except exception.BuildAbortException:
pass
mock_build_network.assert_called_once_with(self.context, self.instance,