Merge pull request #2657 from nschlemm/20140516-test_testcase_ordering

cater for running tests from another directory than tests

1 files changed, 12 insertions, 11 deletions

diff --git a/tests/test_runner/test_discover_runner.py b/tests/test_runner/test_discover_runner.py
index 975819508d..4ab0cf8ae3 100644
--- a/tests/test_runner/test_discover_runner.py
+++ b/tests/test_runner/test_discover_runner.py
@@ -104,17 +104,18 @@ class DiscoverRunnerTest(TestCase):
         self.assertEqual(count, 0)
 
     def test_testcase_ordering(self):
-        suite = DiscoverRunner().build_suite(["test_discovery_sample/"])
-        self.assertEqual(
-            suite._tests[0].__class__.__name__,
-            'TestDjangoTestCase',
-            msg="TestDjangoTestCase should be the first test case")
-        self.assertEqual(
-            suite._tests[1].__class__.__name__,
-            'TestZimpleTestCase',
-            msg="TestZimpleTestCase should be the second test case")
-        # All others can follow in unspecified order, including doctests
-        self.assertIn('DocTestCase', [t.__class__.__name__ for t in suite._tests[2:]])
+        with change_cwd(".."):
+            suite = DiscoverRunner().build_suite(["test_discovery_sample/"])
+            self.assertEqual(
+                suite._tests[0].__class__.__name__,
+                'TestDjangoTestCase',
+                msg="TestDjangoTestCase should be the first test case")
+            self.assertEqual(
+                suite._tests[1].__class__.__name__,
+                'TestZimpleTestCase',
+                msg="TestZimpleTestCase should be the second test case")
+            # All others can follow in unspecified order, including doctests
+            self.assertIn('DocTestCase', [t.__class__.__name__ for t in suite._tests[2:]])
 
     def test_overrideable_test_suite(self):
         self.assertEqual(DiscoverRunner().test_suite, TestSuite)