Show More
@@ -427,3 +427,7 b' def has_py3k():' | |||||
427 | @check("pure", "running with pure Python code") |
|
427 | @check("pure", "running with pure Python code") | |
428 | def has_pure(): |
|
428 | def has_pure(): | |
429 | return os.environ.get("HGTEST_RUN_TESTS_PURE") == "--pure" |
|
429 | return os.environ.get("HGTEST_RUN_TESTS_PURE") == "--pure" | |
|
430 | ||||
|
431 | @check("slow", "allow slow tests") | |||
|
432 | def has_slow(): | |||
|
433 | return os.environ.get('HGTEST_SLOW') == 'slow' |
@@ -259,6 +259,8 b' def getparser():' | |||||
259 | help='run tests in random order') |
|
259 | help='run tests in random order') | |
260 | parser.add_option('--profile-runner', action='store_true', |
|
260 | parser.add_option('--profile-runner', action='store_true', | |
261 | help='run statprof on run-tests') |
|
261 | help='run statprof on run-tests') | |
|
262 | parser.add_option('--allow-slow-tests', action='store_true', | |||
|
263 | help='allow extremely slow tests') | |||
262 |
|
264 | |||
263 | for option, (envvar, default) in defaults.items(): |
|
265 | for option, (envvar, default) in defaults.items(): | |
264 | defaults[option] = type(default)(os.environ.get(envvar, default)) |
|
266 | defaults[option] = type(default)(os.environ.get(envvar, default)) | |
@@ -1835,6 +1837,11 b' class TestRunner(object):' | |||||
1835 | if self.options.pure: |
|
1837 | if self.options.pure: | |
1836 | os.environ["HGTEST_RUN_TESTS_PURE"] = "--pure" |
|
1838 | os.environ["HGTEST_RUN_TESTS_PURE"] = "--pure" | |
1837 |
|
1839 | |||
|
1840 | if self.options.allow_slow_tests: | |||
|
1841 | os.environ["HGTEST_SLOW"] = "slow" | |||
|
1842 | elif 'HGTEST_SLOW' in os.environ: | |||
|
1843 | del os.environ['HGTEST_SLOW'] | |||
|
1844 | ||||
1838 | self._coveragefile = os.path.join(self._testdir, b'.coverage') |
|
1845 | self._coveragefile = os.path.join(self._testdir, b'.coverage') | |
1839 |
|
1846 | |||
1840 | vlog("# Using TESTDIR", self._testdir) |
|
1847 | vlog("# Using TESTDIR", self._testdir) |
@@ -621,3 +621,17 b' test that TESTDIR is referred in PATH' | |||||
621 | # Ran 1 tests, 0 skipped, 0 warned, 0 failed. |
|
621 | # Ran 1 tests, 0 skipped, 0 warned, 0 failed. | |
622 |
|
622 | |||
623 | #endif |
|
623 | #endif | |
|
624 | ||||
|
625 | test support for --allow-slow-tests | |||
|
626 | $ cat > test-very-slow-test.t <<EOF | |||
|
627 | > #require slow | |||
|
628 | > $ echo pass | |||
|
629 | > pass | |||
|
630 | > EOF | |||
|
631 | $ run-tests.py test-very-slow-test.t | |||
|
632 | s | |||
|
633 | Skipped test-very-slow-test.t: skipped | |||
|
634 | # Ran 0 tests, 1 skipped, 0 warned, 0 failed. | |||
|
635 | $ run-tests.py --allow-slow-tests test-very-slow-test.t | |||
|
636 | . | |||
|
637 | # Ran 1 tests, 0 skipped, 0 warned, 0 failed. |
General Comments 0
You need to be logged in to leave comments.
Login now