summary refs log tree commit diff stats
path: root/test/all_tests.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-05 21:30:15 +0200
committerhut <hut@lavabit.com>2010-10-05 21:30:15 +0200
commit258a2668e6cdd34351979b8da17c6e66a738996e (patch)
treecd3406c2198daced1f12cb11c4091fa1ed99dd4c /test/all_tests.py
parentdc7ee19fc15eee33c948d0ccd6c06df9682c0bf3 (diff)
parentd3bcb234bf5776da7d9b66e73107e906342eeb7d (diff)
downloadranger-258a2668e6cdd34351979b8da17c6e66a738996e.tar.gz
Merge branch 'stable' into preview
Conflicts:
	ranger/shared/settings.py
Diffstat (limited to 'test/all_tests.py')
-rwxr-xr-xtest/all_tests.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/all_tests.py b/test/all_tests.py
index 7cfc855f..0c184df5 100755
--- a/test/all_tests.py
+++ b/test/all_tests.py
@@ -19,8 +19,12 @@ Run all the tests inside this directory as a test suite.
 Usage: ./all_tests.py [verbosity]
 """
 
-import os
+import os.path
 import sys
+rangerpath = os.path.join(os.path.dirname(__file__), '..')
+if sys.path[1] != rangerpath:
+	sys.path[1:1] = [rangerpath]
+
 import unittest
 
 if __name__ == '__main__':