diff options
author | Mats Wichmann <mats@linux.com> | 2021-11-11 15:12:01 -0700 |
---|---|---|
committer | Mats Wichmann <mats@linux.com> | 2023-05-08 08:06:21 -0600 |
commit | aed512b9626a44e19b0368f241ca504cffa01a22 (patch) | |
tree | 37d356c89e334185d00617d0d9cb083db21844b5 /test/runtest/simple/no_result.py | |
parent | fcb92c4ff1503ac0cf920d26f771b8f47386f4dc (diff) | |
download | scons-git-aed512b9626a44e19b0368f241ca504cffa01a22.tar.gz |
Use pathlib in runtest
In the past, there have been some mismatches between how tests are
specified and how they are found. testlist files, excludelist files
and command-line specifications should be agnostic to operating system
conventions. For example, typing "runtest.py foo/bar" on windows
will produce paths like foo/bar\test.py, which is hard to match and
painful to read, it should obviously match discovered foo\bar\test.py.
Test information should be output using the native path separator for
consistency.
Using pathlib lets these be normalized - stored in a common format and
output in the expected format.
Adding this normalization of course broke some tests, which either
intentionally or through omission expected some portion of a path to
be UNIX-style. Specifically these five:
test\runtest\baseline\fail.py
test\runtest\baseline\no_result.py
test\runtest\simple\fail.py
test\runtest\simple\no_result.py
test\runtest\simple\pass.py
test\runtest\testargv.py
This was fixed and a general cleanup/reformat performed on the
runtest tests.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/runtest/simple/no_result.py')
-rw-r--r-- | test/runtest/simple/no_result.py | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/test/runtest/simple/no_result.py b/test/runtest/simple/no_result.py index 33f28e4a9..beb82b01c 100644 --- a/test/runtest/simple/no_result.py +++ b/test/runtest/simple/no_result.py @@ -27,35 +27,40 @@ Test how we handle a no-results test specified on the command line. """ +import os + import TestRuntest pythonstring = TestRuntest.pythonstring pythonflags = TestRuntest.pythonflags +test_no_result_py = os.path.join('test', 'no_result.py') test = TestRuntest.TestRuntest() - test.subdir('test') - test.write_no_result_test(['test', 'no_result.py']) -expect_stdout = """\ -%(pythonstring)s%(pythonflags)s test/no_result.py +expect_stdout = f"""\ +{pythonstring}{pythonflags} {test_no_result_py} NO RESULT TEST STDOUT -""" % locals() +""" expect_stderr = """\ NO RESULT TEST STDERR """ -test.run(arguments='--no-ignore-skips -k test/no_result.py', - status=2, - stdout=expect_stdout, - stderr=expect_stderr) +test.run( + arguments='--no-ignore-skips -k test/no_result.py', + status=2, + stdout=expect_stdout, + stderr=expect_stderr, +) -test.run(arguments='-k test/no_result.py', - status=0, - stdout=expect_stdout, - stderr=expect_stderr) +test.run( + arguments='-k test/no_result.py', + status=0, + stdout=expect_stdout, + stderr=expect_stderr, +) test.pass_test() |