openstack
/
python-novaclient
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: I809825560b0324498010bd93aa1ceef552554375
Partial-Bug: #1266962
This commit is contained in:
Zhongyue Luo 2014-01-09 10:24:34 +08:00 committed by Gerrit Code Review
parent 8e9c038f15
commit c71131a509
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
novaclient/tests/v1_1/test_shell.py
View File

@ -26,7 +26,6 @@ import six
import novaclient.client
from novaclient import exceptions
from novaclient.openstack.common import timeutils
import novaclient.shell
from novaclient.tests import utils
from novaclient.tests.v1_1 import fakes
@ -69,7 +68,6 @@ class ShellTest(utils.TestCase):
self.useFixture(fixtures.MonkeyPatch(
'novaclient.client.get_client_class',
lambda *_: fakes.FakeClient))
self.addCleanup(timeutils.clear_time_override)
@mock.patch('sys.stdout', new_callable=six.StringIO)
def run_command(self, cmd, mock_stdout):
@ -1076,8 +1074,9 @@ class ShellTest(utils.TestCase):
'end=2005-02-01T00:00:00&' +
'detailed=1')
def test_usage_list_no_args(self):
timeutils.set_time_override(datetime.datetime(2005, 2, 1, 0, 0))
@mock.patch('novaclient.openstack.common.timeutils.utcnow')
def test_usage_list_no_args(self, mock_utcnow):
mock_utcnow.return_value = datetime.datetime(2005, 2, 1, 0, 0)
self.run_command('usage-list')
self.assert_called('GET',
'/os-simple-tenant-usage?' +

2
novaclient/tests/v3/test_shell.py
View File

@ -20,7 +20,6 @@ import fixtures
import mock
import six
from novaclient.openstack.common import timeutils
import novaclient.shell
from novaclient.tests import utils
from novaclient.tests.v3 import fakes
@ -62,7 +61,6 @@ class ShellTest(utils.TestCase):
self.useFixture(fixtures.MonkeyPatch(
'novaclient.client.get_client_class',
lambda *_: fakes.FakeClient))
self.addCleanup(timeutils.clear_time_override)
@mock.patch('sys.stdout', new_callable=six.StringIO)
def run_command(self, cmd, mock_stdout):