diff options
| author | William Deegan <bill@baddogconsulting.com> | 2024-12-16 05:07:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-16 05:07:39 (GMT) |
| commit | f906d016df29c879f7eb5d8a28d5f12a4d0a4d0f (patch) | |
| tree | fa495355cea8182c5155f40e2979bb5e0671c34d /test | |
| parent | 3f6be17927839c2cf0a94216929911a4136a833b (diff) | |
| parent | 393792cb0b334bec81f9b32e70bf2c356ab35d37 (diff) | |
| download | SCons-f906d016df29c879f7eb5d8a28d5f12a4d0a4d0f.zip SCons-f906d016df29c879f7eb5d8a28d5f12a4d0a4d0f.tar.gz SCons-f906d016df29c879f7eb5d8a28d5f12a4d0a4d0f.tar.bz2 | |
Merge branch 'master' into maint/st_mode
Diffstat (limited to 'test')
| -rw-r--r-- | test/update-release-info/update-release-info.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/test/update-release-info/update-release-info.py b/test/update-release-info/update-release-info.py index 2de4713..bebd8a9 100644 --- a/test/update-release-info/update-release-info.py +++ b/test/update-release-info/update-release-info.py @@ -53,11 +53,24 @@ test = TestRuntest.TestRuntest( if not os.path.exists(test.program): test.skip_test("update-release-info.py is not distributed in this package\n") -expected_stderr = """usage: update-release-info.py [-h] [--verbose] [--timestamp TIMESTAMP] +expected_stderr = """\ +usage: update-release-info.py [-h] [--verbose] [--timestamp TIMESTAMP] [{develop,release,post}] update-release-info.py: error: argument mode: invalid choice: 'bad' (choose from 'develop', 'release', 'post') """ -test.run(arguments='bad', stderr=expected_stderr, status=2) +# The way the choices are rendered in help by argparse changed with +# Python 3.12.8, # 3.13.1, 3.14.0a2. Change the test to accept either. +expected_stderr_new = """\ +usage: update-release-info.py [-h] [--verbose] [--timestamp TIMESTAMP] + [{develop,release,post}] +update-release-info.py: error: argument mode: invalid choice: 'bad' (choose from develop, release, post) +""" +test.run(arguments='bad', stderr=None, status=2) +fail_strings = [ + expected_stderr, + expected_stderr_new, +] +test.must_contain_any_line(test.stderr(), fail_strings) # Strings to go in ReleaseConfig combo_strings = [ |