openstack/nova
Code Issues Proposed changes

Merge "Stop using mox stubs in test_server_usage.py"

Browse Source
This commit is contained in:
Jenkins
2016-06-10 14:59:39 +00:00
committed by Gerrit Code Review
parent 15d4e92368 7edc030173
commit 8b963ecff0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/unit/api/openstack/compute/test_server_usage.py
View File

@@ -19,7 +19,6 @@ from oslo_serialization import jsonutils
from oslo_utils import fixture as utils_fixture
from oslo_utils import timeutils
from nova import compute
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
@@ -63,8 +62,8 @@ class ServerUsageTestV21(test.TestCase):
def setUp(self):
super(ServerUsageTestV21, self).setUp()
fakes.stub_out_nw_api(self)
self.stubs.Set(compute.api.API, 'get', fake_compute_get)
self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
self.stub_out('nova.compute.api.API.get', fake_compute_get)
self.stub_out('nova.compute.api.API.get_all', fake_compute_get_all)
self.flags(
osapi_compute_extension=[
'nova.api.openstack.compute.contrib.select_extensions'],
@@ -125,7 +124,7 @@ class ServerUsageTestV21(test.TestCase):
def fake_compute_get(*args, **kwargs):
raise exception.InstanceNotFound(instance_id='fake')
self.stubs.Set(compute.api.API, 'get', fake_compute_get)
self.stub_out('nova.compute.api.API.get', fake_compute_get)
url = self._prefix + '/servers/70f6db34-de8d-4fbd-aafb-4065bdfa6115'
res = self._make_request(url)