diff options
author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-21 16:19:48 -0800 |
---|---|---|
committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-21 16:19:48 -0800 |
commit | 11c57867ec18bd61dcc6bde0dc4b459318d54e70 (patch) | |
tree | 4bd4065d0aab48121d223c7992d3ae4e10e403b3 | |
parent | 71f7119910f16cb99c10f43a07ccb1e7c0ca473f (diff) | |
download | nova-11c57867ec18bd61dcc6bde0dc4b459318d54e70.tar.gz nova-11c57867ec18bd61dcc6bde0dc4b459318d54e70.tar.xz nova-11c57867ec18bd61dcc6bde0dc4b459318d54e70.zip |
fixed newline and moved import fake_flags into run_tests where it makes more sense
-rw-r--r-- | nova/test.py | 3 | ||||
-rw-r--r-- | run_tests.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nova/test.py b/nova/test.py index 8022396cd..bff43b6c7 100644 --- a/nova/test.py +++ b/nova/test.py @@ -36,9 +36,6 @@ from nova import log as logging from nova import rpc from nova.network import manager as network_manager -from nova.tests import fake_flags -logging.reset() - FLAGS = flags.FLAGS flags.DEFINE_bool('flush_db', True, diff --git a/run_tests.py b/run_tests.py index cb957da42..6d96454b9 100644 --- a/run_tests.py +++ b/run_tests.py @@ -27,6 +27,8 @@ from nose import result from nose import core from nova import log as logging +from nova.tests import fake_flags + class NovaTestResult(result.TextTestResult): def __init__(self, *args, **kw): |