diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-18 20:00:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-18 20:00:44 +0000 |
| commit | 5fa80467c2d03e514f5d2cd574406d8895fcecc4 (patch) | |
| tree | 18dc4353fd1f0bd0a9e2653f91864d9abd7e9c1c | |
| parent | 41e34c0c0716532e71060b9f73494c34e7fa6b45 (diff) | |
| parent | 21a86efef4656705a6590079e1491521a2954b47 (diff) | |
| download | nova-5fa80467c2d03e514f5d2cd574406d8895fcecc4.tar.gz nova-5fa80467c2d03e514f5d2cd574406d8895fcecc4.tar.xz nova-5fa80467c2d03e514f5d2cd574406d8895fcecc4.zip | |
Merge "Properly remove the time override in quota tests."
| -rw-r--r-- | nova/tests/test_quota.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 6fd206ae6..a5a2539cd 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -211,7 +211,7 @@ class QuotaIntegrationTestCase(test.TestCase): self._create_with_injected_files, files) def test_reservation_expire(self): - timeutils.set_time_override() + self.useFixture(test.TimeOverride()) def assertInstancesReserved(reserved): result = quota.QUOTAS.get_project_quotas(self.context, @@ -718,11 +718,7 @@ class DbQuotaDriverTestCase(test.TestCase): self.calls = [] - timeutils.set_time_override() - - def tearDown(self): - timeutils.clear_time_override() - super(DbQuotaDriverTestCase, self).tearDown() + self.useFixture(test.TimeOverride()) def test_get_defaults(self): # Use our pre-defined resources @@ -1422,7 +1418,7 @@ class QuotaReserveSqlAlchemyTestCase(test.TestCase): self.stubs.Set(sqa_api, '_quota_usage_create', fake_quota_usage_create) self.stubs.Set(sqa_api, 'reservation_create', fake_reservation_create) - timeutils.set_time_override() + self.useFixture(test.TimeOverride()) def _make_quota_usage(self, project_id, resource, in_use, reserved, until_refresh, created_at, updated_at): |