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: I203f7369943b948e0462becbddcba65b2d1576f0
Partial-Bug: #1266962
This commit is contained in:
Zhongyue Luo 2014-02-13 15:44:50 +09:00
parent ddae276b32
commit ed52d4538c
4 changed files with 23 additions and 18 deletions

View File

@ -76,14 +76,14 @@ class GlanceBase(models.ModelBase, models.TimestampMixin):
from glance.db.sqlalchemy import api as db_api
super(GlanceBase, self).save(session or db_api.get_session())
created_at = Column(DateTime, default=timeutils.utcnow,
created_at = Column(DateTime, default=lambda: timeutils.utcnow(),
nullable=False)
# TODO(vsergeyev): Column `updated_at` have no default value in
# openstack common code. We should decide, is this value
# required and make changes in oslo (if required) or
# in glance (if not).
updated_at = Column(DateTime, default=timeutils.utcnow,
nullable=False, onupdate=timeutils.utcnow)
updated_at = Column(DateTime, default=lambda: timeutils.utcnow(),
nullable=False, onupdate=lambda: timeutils.utcnow())
# TODO(boris-42): Use SoftDeleteMixin instead of deleted Column after
# migration that provides UniqueConstraints and change
# type of this column.

View File

@ -19,6 +19,8 @@ import copy
import datetime
import uuid
import mock
from glance.common import exception
from glance import context
from glance.openstack.common import timeutils
@ -88,7 +90,6 @@ class TestDriver(test_utils.BaseTestCase):
db_tests.reset_db(self.db_api)
self.fixtures = self.build_image_fixtures()
self.create_images(self.fixtures)
self.addCleanup(timeutils.clear_time_override)
def build_image_fixtures(self):
dt1 = timeutils.utcnow()
@ -129,8 +130,9 @@ class DriverTests(object):
fixture = {'name': 'mark', 'size': 12, 'status': 'queued'}
self.db_api.image_create(self.context, fixture)
def test_image_create_defaults(self):
timeutils.set_time_override()
@mock.patch.object(timeutils, 'utcnow')
def test_image_create_defaults(self, mock_utcnow):
mock_utcnow.return_value = datetime.datetime.utcnow()
create_time = timeutils.utcnow()
values = {'status': 'queued',
'created_at': create_time,
@ -944,8 +946,9 @@ class DriverTests(object):
self.assertRaises(exception.NotFound, self.db_api.image_tag_delete,
self.context, UUID1, 'snap')
def test_image_member_create(self):
timeutils.set_time_override()
@mock.patch.object(timeutils, 'utcnow')
def test_image_member_create(self, mock_utcnow):
mock_utcnow.return_value = datetime.datetime.utcnow()
memberships = self.db_api.image_member_find(self.context)
self.assertEqual([], memberships)
@ -1167,7 +1170,6 @@ class DriverQuotaTests(test_utils.BaseTestCase):
auth_tok='%s:%s:user' % (self.owner_id1, self.owner_id1))
self.db_api = db_tests.get_db(self.config)
db_tests.reset_db(self.db_api)
self.addCleanup(timeutils.clear_time_override)
dt1 = timeutils.utcnow()
dt2 = dt1 + datetime.timedelta(microseconds=5)
fixtures = [
@ -1267,7 +1269,6 @@ class TaskTests(test_utils.BaseTestCase):
self.db_api = db_tests.get_db(self.config)
self.fixtures = self.build_task_fixtures()
db_tests.reset_db(self.db_api)
self.addCleanup(timeutils.clear_time_override)
def build_task_fixtures(self):
self.context.tenant = str(uuid.uuid4())

View File

@ -17,6 +17,7 @@
import datetime
import uuid
import mock
from oslo.config import cfg
from glance.common import exception
@ -422,8 +423,9 @@ class TestTask(test_utils.BaseTestCase):
self.task.begin_processing()
self.assertEqual(self.task.status, 'processing')
def test_succeed(self):
timeutils.set_time_override()
@mock.patch.object(timeutils, 'utcnow')
def test_succeed(self, mock_utcnow):
mock_utcnow.return_value = datetime.datetime.utcnow()
self.task.begin_processing()
self.task.succeed('{"location": "file://home"}')
self.assertEqual(self.task.status, 'success')
@ -433,10 +435,10 @@ class TestTask(test_utils.BaseTestCase):
self.task.expires_at,
expected
)
timeutils.clear_time_override()
def test_fail(self):
timeutils.set_time_override()
@mock.patch.object(timeutils, 'utcnow')
def test_fail(self, mock_utcnow):
mock_utcnow.return_value = datetime.datetime.utcnow()
self.task.begin_processing()
self.task.fail('{"message": "connection failed"}')
self.assertEqual(self.task.status, 'failure')
@ -446,7 +448,6 @@ class TestTask(test_utils.BaseTestCase):
self.task.expires_at,
expected
)
timeutils.clear_time_override()
class TestTaskDetails(test_utils.BaseTestCase):

View File

@ -16,6 +16,7 @@
import datetime
import mock
import webob
from glance.common import exception
@ -432,11 +433,13 @@ class TestTaskNotifications(utils.BaseTestCase):
self.task_details_proxy = notifier.TaskDetailsProxy(self.task_details,
self.context,
self.notifier)
timeutils.set_time_override()
self.patcher = mock.patch.object(timeutils, 'utcnow')
mock_utcnow = self.patcher.start()
mock_utcnow.return_value = datetime.datetime.utcnow()
def tearDown(self):
super(TestTaskNotifications, self).tearDown()
timeutils.clear_time_override()
self.patcher.stop()
def test_task_create_notification(self):
self.task_repo_proxy.add(self.task_proxy, self.task_details_proxy)