summaryrefslogtreecommitdiff
path: root/tests/test_runner
diff options
context:
space:
mode:
authorNikolaus Schlemm <capo@coder-nostra.com>2014-05-16 12:11:35 +0200
committerTim Graham <timograham@gmail.com>2014-09-05 14:35:00 -0400
commitd0c6016367c11d4d4cc42ace340f951f5b75738e (patch)
treebdde975df678b7fa595f7662a5d364f1bd208af6 /tests/test_runner
parent0c3a23d2b9fd5399c2cdda8c72d43c960040886a (diff)
[1.7.x] cater for running tests from another directory than tests - applying existing pattern to newly added test_testcase_ordering as well
Backport of d11e836203 from master
Diffstat (limited to 'tests/test_runner')
-rw-r--r--tests/test_runner/test_discover_runner.py23
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)