Merge pull request #118 from naylor-b/sys_path_timing

added current directory to sys.path during try_import to avoid any relative import failures in test files

Author: swryan

testflo/test.py

@@ -19,7 +19,7 @@
 from testflo.cover import start_coverage, stop_coverage
 
 from testflo.util import get_module, ismethod, get_memory_usage, \
-                         get_testpath, _options2args
+                         get_testpath, _options2args, _testing_path
 from testflo.utresult import UnitTestResult
 from testflo.devnull import DevNull
 
@@ -46,12 +46,6 @@ def __init__(self):
         self.size = 1
 
 
-# create a copy of sys.path with an extra entry at the beginning so that
-# we can quickly replace the first entry with the curent test's dir rather
-# than constantly copying the whole sys.path
-_testing_path = ['.'] + sys.path
-
-
 @contextmanager
 def testcontext(test):
     global _testing_path

testflo/util.py

@@ -18,6 +18,12 @@
 from argparse import ArgumentParser, _AppendAction
 
 
+# create a copy of sys.path with an extra entry at the beginning so that
+# we can quickly replace the first entry with the curent test's dir rather
+# than constantly copying the whole sys.path
+_testing_path = ['.'] + sys.path
+
+
 _store = {}
 
 
@@ -336,7 +342,11 @@ def find_module(name):
 
 
 def try_import(fname, modpath):
+    global _testing_path
     try:
+        _testing_path[0] = os.path.dirname(fname)
+        old_sys_path = sys.path
+        sys.path = _testing_path
         mod = import_module(modpath)
     except ImportError:
         # this might be a module that's not in the same
@@ -355,6 +365,8 @@ def try_import(fname, modpath):
             del sys.modules[modpath]
         finally:
             sys.path = oldpath
+    finally:
+        sys.path = old_sys_path
 
     return mod