Merge "Remove mox from api/openstack/compute/test_fping.py"
This commit is contained in:
commit
6b2c161b8f
@ -21,7 +21,6 @@ from nova.api.openstack.compute import fping as fping_v21
|
|||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova.tests.unit.api.openstack import fakes
|
from nova.tests.unit.api.openstack import fakes
|
||||||
import nova.utils
|
|
||||||
|
|
||||||
|
|
||||||
FAKE_UUID = fakes.FAKE_UUID
|
FAKE_UUID = fakes.FAKE_UUID
|
||||||
@ -43,9 +42,10 @@ class FpingTestV21(test.TestCase):
|
|||||||
return_servers)
|
return_servers)
|
||||||
self.stub_out("nova.db.instance_get_by_uuid",
|
self.stub_out("nova.db.instance_get_by_uuid",
|
||||||
return_server)
|
return_server)
|
||||||
self.stubs.Set(nova.utils, "execute",
|
self.stub_out('nova.utils.execute',
|
||||||
execute)
|
execute)
|
||||||
self.stubs.Set(self.controller_cls, "check_fping",
|
self.stub_out("nova.api.openstack.compute.fping.FpingController."
|
||||||
|
"check_fping",
|
||||||
lambda self: None)
|
lambda self: None)
|
||||||
self.controller = self.controller_cls()
|
self.controller = self.controller_cls()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user