# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1245086780 18000
# Node ID 72e63999722f9eceadf0b198b247ecd4e63403b8
# Parent  f5222d0216658fc72e3834832e3499e6bb399ba8
tests: make comprehensive tests work properly with nose and run.py

diff --git a/tests/comprehensive/__init__.py b/tests/comprehensive/__init__.py
deleted file mode 100644
--- a/tests/comprehensive/__init__.py
+++ /dev/null
@@ -1,1 +0,0 @@
-# make this a package
diff --git a/tests/comprehensive/test_verify.py b/tests/comprehensive/test_verify.py
--- a/tests/comprehensive/test_verify.py
+++ b/tests/comprehensive/test_verify.py
@@ -2,7 +2,12 @@ import os
 import pickle
 import unittest
 
-import test_util
+# wrapped in a try/except because of weirdness in how
+# run.py works as compared to nose.
+try:
+    import test_util
+except ImportError:
+    from tests import test_util
 
 from mercurial import hg
 from mercurial import ui
diff --git a/tests/run.py b/tests/run.py
--- a/tests/run.py
+++ b/tests/run.py
@@ -25,8 +25,10 @@ import test_tags
 import test_utility_commands
 import test_urls
 
-from comprehensive import test_stupid_pull
-from comprehensive import test_verify
+sys.path.append(os.path.join(os.path.dirname(__file__), 'comprehensive'))
+
+import test_stupid_pull
+import test_verify
 
 def comprehensive(mod):
     dir = os.path.basename(os.path.dirname(mod.__file__))