summaryrefslogtreecommitdiffstats
path: root/nova/test.py
diff options
context:
space:
mode:
authorZhongyue Luo <lzyeval@gmail.com>2012-06-06 10:32:49 +0800
committerZhongyue Luo <lzyeval@gmail.com>2012-06-16 07:17:01 +0800
commit9ff3121bd90133fb3b37c0e10407b5f7ade26b90 (patch)
tree9c3d48c0b49f89374813c23dc49bc7ded34ed414 /nova/test.py
parentfb9abcc83935b01746aeba0db4c431fe72b921fc (diff)
downloadnova-9ff3121bd90133fb3b37c0e10407b5f7ade26b90.tar.gz
nova-9ff3121bd90133fb3b37c0e10407b5f7ade26b90.tar.xz
nova-9ff3121bd90133fb3b37c0e10407b5f7ade26b90.zip
Replaces functions in utils.py with openstack/common/timeutils.py
Fixes bug #1008628 1. Edit openstack-common.conf and import nova/openstack/common/timeutils.py 2. Move time related functions from utils.py to timeutils.py 3. Replace following functions in utils.py with timeutils.py - isotime - parse_isotime - strtime - parse_strtime - normalize_time - is_older_than - utcnow_ts - utcnow - set_time_override - advance_time_delta - advance_time_seconds - clear_time_override 4. Remove datetime related functions and datetime related unittests Change-Id: I9a92be286fb071b6237dd39495d88dae106e2ce0
Diffstat (limited to 'nova/test.py')
-rw-r--r--nova/test.py4
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