about summary refs log tree commit diff stats
path: root/test/tc_keyapi.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/tc_keyapi.py
parentdc7ee19fc15eee33c948d0ccd6c06df9682c0bf3 (diff)
parentd3bcb234bf5776da7d9b66e73107e906342eeb7d (diff)
downloadranger-258a2668e6cdd34351979b8da17c6e66a738996e.tar.gz
Merge branch 'stable' into preview
Conflicts:
	ranger/shared/settings.py
Diffstat (limited to 'test/tc_keyapi.py')
-rw-r--r--test/tc_keyapi.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/tc_keyapi.py b/test/tc_keyapi.py
index 48282a7d..79d89fa5 100644
--- a/test/tc_keyapi.py
+++ b/test/tc_keyapi.py
@@ -13,6 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os.path
+import sys
+rangerpath = os.path.join(os.path.dirname(__file__), '..')
+if sys.path[1] != rangerpath:
+	sys.path[1:1] = [rangerpath]
+
 from unittest import TestCase, main
 
 class Test(TestCase):
>148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178