openstack
/
manila
Code Issues Proposed changes

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: Ida9b5b0130a38f45e1f51bf4fbdb1d1a5851cf82
Partial-Bug: #1266962
This commit is contained in:
Zhongyue Luo 2014-02-12 15:45:44 +08:00
parent 61a52b88d1
commit ce2ac6901d
4 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/db/sqlalchemy/models.py
View File

@ -44,8 +44,8 @@ class ManilaBase(object):
"""Base class for Manila Models."""
__table_args__ = {'mysql_engine': 'InnoDB'}
__table_initialized__ = False
created_at = Column(DateTime, default=timeutils.utcnow)
updated_at = Column(DateTime, onupdate=timeutils.utcnow)
created_at = Column(DateTime, default=lambda: timeutils.utcnow())
updated_at = Column(DateTime, onupdate=lambda: timeutils.utcnow())
deleted_at = Column(DateTime)
deleted = Column(Integer, default=0)
metadata = None

19
manila/tests/test_quota.py
View File

@ -18,19 +18,20 @@
import datetime
import mock
from oslo.config import cfg
from manila import context
from manila import db
from manila.db.sqlalchemy import api as sqa_api
from manila.db.sqlalchemy import models as sqa_models
from manila import exception
from manila.openstack.common import rpc
from manila.openstack.common import timeutils
from manila import quota
from manila import share
from manila import test
import manila.tests.image.fake
from oslo.config import cfg
CONF = cfg.CONF
@ -640,10 +641,12 @@ class DbQuotaDriverTestCase(test.TestCase):
self.calls = []
timeutils.set_time_override()
self.patcher = mock.patch.object(timeutils, 'utcnow')
self.mock_utcnow = self.patcher.start()
self.mock_utcnow.return_value = datetime.datetime.utcnow()
def tearDown(self):
timeutils.clear_time_override()
self.patcher.stop()
super(DbQuotaDriverTestCase, self).tearDown()
def test_get_defaults(self):
@ -1247,7 +1250,13 @@ 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.patcher = mock.patch.object(timeutils, 'utcnow')
self.mock_utcnow = self.patcher.start()
self.mock_utcnow.return_value = datetime.datetime.utcnow()
def tearDown(self):
self.patcher.stop()
super(QuotaReserveSqlAlchemyTestCase, self).tearDown()
def _make_quota_usage(self, project_id, user_id, resource, in_use,
reserved, until_refresh, created_at, updated_at):

45
manila/tests/test_share_api.py
View File

@ -16,8 +16,11 @@
"""Unit tests for the Share API module."""
import datetime
import mox
import random
import uuid
import mock
import mox
import suds
from manila import context
@ -110,13 +113,17 @@ class ShareAPITestCase(test.TestCase):
self.stubs.Set(self.api, 'share_rpcapi', self.share_rpcapi)
self.stubs.Set(quota.QUOTAS, 'reserve', lambda *args, **kwargs: None)
self.patcher = mock.patch.object(timeutils, 'utcnow')
self.mock_utcnow = self.patcher.start()
self.mock_utcnow.return_value = datetime.datetime.utcnow()
def tearDown(self):
self.patcher.stop()
super(ShareAPITestCase, self).tearDown()
timeutils.clear_time_override()
def test_create(self):
date = datetime.datetime(1, 1, 1, 1, 1, 1)
timeutils.set_time_override(override_time=date)
self.mock_utcnow.return_value = date
share = fake_share('fakeid',
user_id=self.context.user_id,
project_id=self.context.project_id,
@ -143,7 +150,7 @@ class ShareAPITestCase(test.TestCase):
def test_create_snapshot(self):
date = datetime.datetime(1, 1, 1, 1, 1, 1)
timeutils.set_time_override(override_time=date)
self.mock_utcnow.return_value = date
share = fake_share('fakeid',
status='available')
snapshot = fake_snapshot('fakesnapshotid',
@ -180,7 +187,7 @@ class ShareAPITestCase(test.TestCase):
def test_delete_snapshot(self):
date = datetime.datetime(1, 1, 1, 1, 1, 1)
timeutils.set_time_override(override_time=date)
self.mock_utcnow.return_value = date
share = fake_share('fakeid')
snapshot = fake_snapshot('fakesnapshotid', share_id=share['id'],
status='available')
@ -220,7 +227,7 @@ class ShareAPITestCase(test.TestCase):
def test_create_from_snapshot_available(self):
date = datetime.datetime(1, 1, 1, 1, 1, 1)
timeutils.set_time_override(override_time=date)
self.mock_utcnow.return_value = date
snapshot = fake_snapshot('fakesnapshotid',
share_id='fakeshare_id',
status='available')
@ -291,7 +298,7 @@ class ShareAPITestCase(test.TestCase):
def test_delete_available(self):
date = datetime.datetime(2, 2, 2, 2, 2, 2)
timeutils.set_time_override(override_time=date)
self.mock_utcnow.return_value = date
share = fake_share('fakeid', status='available')
options = {'status': 'deleting',
'terminated_at': date}
@ -309,7 +316,7 @@ class ShareAPITestCase(test.TestCase):
def test_delete_error(self):
date = datetime.datetime(2, 2, 2, 2, 2, 2)
timeutils.set_time_override(override_time=date)
self.mock_utcnow.return_value = date
share = fake_share('fakeid', status='error')
options = {'status': 'deleting',
'terminated_at': date}
@ -538,31 +545,37 @@ class ShareAPITestCase(test.TestCase):
def test_share_metadata_get(self):
metadata = {'a': 'b', 'c': 'd'}
db_driver.share_create(self.context, {'id': '1', 'metadata': metadata})
share_id = str(uuid.uuid4())
db_driver.share_create(self.context, {'id': share_id,
'metadata': metadata})
self.assertEqual(metadata,
db_driver.share_metadata_get(self.context, '1'))
db_driver.share_metadata_get(self.context, share_id))
def test_share_metadata_update(self):
metadata1 = {'a': '1', 'c': '2'}
metadata2 = {'a': '3', 'd': '5'}
should_be = {'a': '3', 'c': '2', 'd': '5'}
db_driver.share_create(self.context, {'id': '1',
share_id = str(uuid.uuid4())
db_driver.share_create(self.context, {'id': share_id,
'metadata': metadata1})
db_driver.share_metadata_update(self.context, '1', metadata2, False)
db_driver.share_metadata_update(self.context, share_id,
metadata2, False)
self.assertEqual(should_be,
db_driver.share_metadata_get(self.context, '1'))
db_driver.share_metadata_get(self.context, share_id))
def test_share_metadata_update_delete(self):
metadata1 = {'a': '1', 'c': '2'}
metadata2 = {'a': '3', 'd': '4'}
should_be = metadata2
db_driver.share_create(self.context, {'id': '1',
share_id = str(uuid.uuid4())
db_driver.share_create(self.context, {'id': share_id,
'metadata': metadata1})
db_driver.share_metadata_update(self.context, '1', metadata2, True)
db_driver.share_metadata_update(self.context, share_id,
metadata2, True)
self.assertEqual(should_be,
db_driver.share_metadata_get(self.context, '1'))
db_driver.share_metadata_get(self.context, share_id))

12
manila/tests/test_utils.py
View File

@ -19,21 +19,21 @@ import datetime
import hashlib
import os
import os.path
import paramiko
import StringIO
import tempfile
import uuid
import mock
import mox
from oslo.config import cfg
import paramiko
import manila
from manila import exception
from manila.openstack.common import strutils
from manila.openstack.common import timeutils
from manila import test
from manila import utils
from oslo.config import cfg
CONF = cfg.CONF
@ -514,10 +514,12 @@ class AuditPeriodTest(test.TestCase):
day=5,
month=3,
year=2012)
timeutils.set_time_override(override_time=self.test_time)
self.patcher = mock.patch.object(timeutils, 'utcnow')
self.mock_utcnow = self.patcher.start()
self.mock_utcnow.return_value = self.test_time
def tearDown(self):
timeutils.clear_time_override()
self.patcher.stop()
super(AuditPeriodTest, self).tearDown()
def test_hour(self):