diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-18 17:02:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-18 17:02:19 +0000 |
| commit | 5bfa8a70e8b11f68deb101c872eace27d7a3b1b4 (patch) | |
| tree | 9c298941f50a7b080518efc53016ec89426496a3 /nova/test.py | |
| parent | 60ea96b288d9d8f29d772dce3763fda466c73040 (diff) | |
| parent | 9ff3121bd90133fb3b37c0e10407b5f7ade26b90 (diff) | |
| download | nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.gz nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.xz nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.zip | |
Merge "Replaces functions in utils.py with openstack/common/timeutils.py"
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/test.py b/nova/test.py index 0108958b8..8de4ddfca 100644 --- a/nova/test.py +++ b/nova/test.py @@ -35,10 +35,10 @@ from nova import flags import nova.image.fake from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import timeutils from nova import service from nova import tests from nova.tests import fake_flags -from nova import utils from nova.virt import fake @@ -131,7 +131,7 @@ class TestCase(unittest.TestCase): # NOTE(vish): We need a better method for creating fixtures for tests # now that we have some required db setup for the system # to work properly. - self.start = utils.utcnow() + self.start = timeutils.utcnow() tests.reset_db() # emulate some of the mox stuff, we can't use the metaclass |