diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-24 16:27:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-24 16:27:09 +0000 |
| commit | 2c786ff3ad0d3fa85735d98f9927e9f92b686edb (patch) | |
| tree | 2df143990fd720867fe7dd61a2556042b9df5756 /nova/tests | |
| parent | f05841caf3dbf7e659b55513f07e9837b1cf22f6 (diff) | |
| parent | 4c4c77925c5df36643b4f91cbe3b220e3551431e (diff) | |
Merge "Remove unused time keyword arg"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compute.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 27fadc321..e8b37ce99 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -58,14 +58,6 @@ flags.DECLARE('stub_network', 'nova.compute.manager') flags.DECLARE('live_migration_retry_count', 'nova.compute.manager') -class FakeTime(object): - def __init__(self): - self.counter = 0 - - def sleep(self, t): - self.counter += t - - orig_rpc_call = rpc.call orig_rpc_cast = rpc.cast @@ -1244,9 +1236,10 @@ class ComputeTestCase(BaseTestCase): c = context.get_admin_context() # start test + self.stubs.Set(time, 'sleep', lambda t: None) self.assertRaises(exception.FixedIpNotFoundForInstance, self.compute.pre_live_migration, - c, inst_ref['id'], time=FakeTime()) + c, inst_ref['id']) # cleanup db.instance_destroy(c, inst_ref['id']) |