From e3eb709b08e52e24cd7e3225a73154efc62ba9fa Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Fri, 7 Feb 2014 12:43:58 +0800
Subject: [PATCH] Removes use of timeutils.set_time_override

The set_time_override function in timeutils was written as a
helper function to mock utcnow for unittests before 'mock' was
generally used. Now that we have mock and fixture, we no longer
need to use it.

Change-Id: I057d4bc3a8b1d4e96e6830cd3071dc96a05496dc
Partial-Bug: #1266962
---
 cinder/tests/test_quota.py | 15 +++++++++------
 cinder/tests/test_utils.py | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/cinder/tests/test_quota.py b/cinder/tests/test_quota.py
index d6bdb3734d6..03017643a99 100644
--- a/cinder/tests/test_quota.py
+++ b/cinder/tests/test_quota.py
@@ -18,6 +18,7 @@
 
 import datetime
 
+import mock
 from oslo.config import cfg
 
 from cinder import context
@@ -737,11 +738,10 @@ class DbQuotaDriverTestCase(test.TestCase):
 
         self.calls = []
 
-        timeutils.set_time_override()
-
-    def tearDown(self):
-        timeutils.clear_time_override()
-        super(DbQuotaDriverTestCase, self).tearDown()
+        patcher = mock.patch.object(timeutils, 'utcnow')
+        self.addCleanup(patcher.stop)
+        self.mock_utcnow = patcher.start()
+        self.mock_utcnow.return_value = datetime.datetime.utcnow()
 
     def test_get_defaults(self):
         # Use our pre-defined resources
@@ -1163,7 +1163,10 @@ 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()
+        patcher = mock.patch.object(timeutils, 'utcnow')
+        self.addCleanup(patcher.stop)
+        self.mock_utcnow = patcher.start()
+        self.mock_utcnow.return_value = datetime.datetime.utcnow()
 
     def _make_quota_usage(self, project_id, resource, in_use, reserved,
                           until_refresh, created_at, updated_at):
diff --git a/cinder/tests/test_utils.py b/cinder/tests/test_utils.py
index 380c1352226..6de90f19844 100644
--- a/cinder/tests/test_utils.py
+++ b/cinder/tests/test_utils.py
@@ -22,6 +22,7 @@ import StringIO
 import tempfile
 import uuid
 
+import mock
 import mox
 from oslo.config import cfg
 import paramiko
@@ -614,17 +615,16 @@ class AuditPeriodTest(test.TestCase):
     def setUp(self):
         super(AuditPeriodTest, self).setUp()
         #a fairly random time to test with
-        self.test_time = datetime.datetime(second=23,
-                                           minute=12,
-                                           hour=8,
-                                           day=5,
-                                           month=3,
-                                           year=2012)
-        timeutils.set_time_override(override_time=self.test_time)
-
-    def tearDown(self):
-        timeutils.clear_time_override()
-        super(AuditPeriodTest, self).tearDown()
+        test_time = datetime.datetime(second=23,
+                                      minute=12,
+                                      hour=8,
+                                      day=5,
+                                      month=3,
+                                      year=2012)
+        patcher = mock.patch.object(timeutils, 'utcnow')
+        self.addCleanup(patcher.stop)
+        self.mock_utcnow = patcher.start()
+        self.mock_utcnow.return_value = test_time
 
     def test_hour(self):
         begin, end = utils.last_completed_audit_period(unit='hour')