Mercurial > hgsubversion

diff tests/comprehensive/test_stupid_pull.py @ 613:58f397523604

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testrunner: delay and `simplify' importing of tests
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 14 May 2010 20:26:06 +0200
parents 1fd3cfa47c5e
children 124cd25de4ef
line wrap: on
line diff
--- a/tests/comprehensive/test_stupid_pull.py
+++ b/tests/comprehensive/test_stupid_pull.py
@@ -5,7 +5,13 @@ import unittest
 from mercurial import hg
 from mercurial import ui
 
-from tests 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 hgsubversion import wrappers