diff options
Diffstat (limited to 'test/runtest/baseline/combined.py')
| -rw-r--r-- | test/runtest/baseline/combined.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/runtest/baseline/combined.py b/test/runtest/baseline/combined.py index 02f3f53..119fc63 100644 --- a/test/runtest/baseline/combined.py +++ b/test/runtest/baseline/combined.py @@ -1,4 +1,3 @@ - #!/usr/bin/env python # # __COPYRIGHT__ @@ -30,11 +29,11 @@ Test a combination of a passing test, failing test, and no-result test with no argument on the command line. """ -import os.path +import os import TestRuntest -python = TestRuntest.python +pythonstring = TestRuntest.pythonstring test_fail_py = os.path.join('test', 'fail.py') test_no_result_py = os.path.join('test', 'no_result.py') test_pass_py = os.path.join('test', 'pass.py') @@ -50,18 +49,18 @@ test.write_no_result_test(['test', 'no_result.py']) test.write_passing_test(['test', 'pass.py']) expect_stdout = """\ -%(python)s -tt test/fail.py +%(pythonstring)s -tt %(test_fail_py)s FAILING TEST STDOUT -%(python)s -tt test/no_result.py +%(pythonstring)s -tt %(test_no_result_py)s NO RESULT TEST STDOUT -%(python)s -tt test/pass.py +%(pythonstring)s -tt %(test_pass_py)s PASSING TEST STDOUT Failed the following test: -\ttest/fail.py +\t%(test_fail_py)s NO RESULT from the following test: -\ttest/no_result.py +\t%(test_no_result_py)s """ % locals() expect_stderr = """\ |