summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-08 15:34:52 +0000
committerGerrit Code Review <review@openstack.org>2011-12-08 15:34:52 +0000
commit50a195bcca4ecf9313f28fbcd78ad5360d64c711 (patch)
tree76dd487ec9ca6e99950fac291b7ff54551827245
parentb855336b1351dcffc1bc9690f86563de8c33e656 (diff)
parentac0ac446aaa0af517a2b726e48d3b37eeffd46e5 (diff)
Merge "Updated the test runner module with a sys.path insert so that tests run in and outside a virtual environment."
-rw-r--r--nova/testing/runner.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/testing/runner.py b/nova/testing/runner.py
index 9fbbb418d..794fa3845 100644
--- a/nova/testing/runner.py
+++ b/nova/testing/runner.py
@@ -63,13 +63,16 @@ import unittest
import sys
import time
-gettext.install('nova', unicode=1)
-
import eventlet
from nose import config
from nose import core
from nose import result
+gettext.install('nova', unicode=1)
+reldir = os.path.join(os.path.dirname(__file__), '..', '..')
+absdir = os.path.abspath(reldir)
+sys.path.insert(0, absdir)
+
from nova import log as logging