From 11c57867ec18bd61dcc6bde0dc4b459318d54e70 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 21 Feb 2011 16:19:48 -0800
Subject: fixed newline and moved import fake_flags into run_tests where it
 makes more sense

---
 nova/test.py | 3 ---
 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):
-- 
cgit