On Sun, Dec 1, 2019 at 1:44 PM Nathan Hartman <hartman.nat...@gmail.com> wrote: > On Sun, Dec 1, 2019 at 12:17 PM Julian Foad <jul...@foad.me.uk> wrote: > > Nathan Hartman wrote: > > > I didn't commit this yet because it affects translations. When > > > modifying strings, do I need to modify the po files in the same > > > commit? > > > > No. Commit first. Translations are updated separately. > > Thanks. > > Committed in r1870689.
And that promptly caused a test failure in getopt_tests.py, because that test compares the output of 'svn help log switch' to expected output, and I rewrapped the first line of help text for 'svn switch'. Committed r1870698 to adjust the expected output accordingly. The other 2 rewrapped lines do not appear to affect tests. On a related note, I cannot seem to run *just* getopt_tests.py. If I run it like this, I get failure: [[[ $ make check TESTS=subversion/tests/cmdline/getopt_tests.py [1/1] getopt_tests.py....................................................FAILURE At least one test FAILED, checking /Users/nate/ramdrive/svn-trunk/tests.log FAIL: getopt_tests.py 1: run svn with no arguments FAIL: getopt_tests.py 2: run svn --version FAIL: getopt_tests.py 3: run svn --version --quiet FAIL: getopt_tests.py 4: run svn --version --verbose FAIL: getopt_tests.py 5: run svn --help FAIL: getopt_tests.py 6: run svn help FAIL: getopt_tests.py 7: run svn help bogus-cmd FAIL: getopt_tests.py 8: run svn help log switch Summary of test results: 1 test PASSED 8 tests FAILED Python version: 2.7.16. SUMMARY: Some tests failed ]]] tests.log contains (only the first failure shown, others are similar): [[[ START: getopt_tests.py W: CWD: /Users/nate/ramdrive/svn-trunk/subversion/tests/cmdline Traceback (most recent call last): File "/Users/nate/ramdrive/svn-trunk/subversion/tests/cmdline/svntest/main.py", line 1931, in run rc = self.pred.run(sandbox) File "/Users/nate/ramdrive/svn-trunk/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/Users/nate/ramdrive/svn-trunk/subversion/tests/cmdline/getopt_tests.py", line 196, in getopt_no_args run_one_test(sbox, 'svn') File "/Users/nate/ramdrive/svn-trunk/subversion/tests/cmdline/getopt_tests.py", line 171, in run_one_test exp_stdout, exp_stderr = load_expected_output(basename) File "/Users/nate/ramdrive/svn-trunk/subversion/tests/cmdline/getopt_tests.py", line 57, in load_expected_output exp_stdout = open(stdout_filename, 'r').readlines() IOError: [Errno 2] No such file or directory: './build/getopt_tests_data/svn_stdout' FAIL: getopt_tests.py 1: run svn with no arguments ]]] So it's looking for build/getopt_tests_data instead of subversion/tests/cmdline/getopt_tests_data. I have not figured out why yet. However, if I just run 'make check' and wait patiently, getopt_tests.py passes. While on the subject of testing, [023/120] fs-test is failing when the entire test suite runs. I have not investigated that yet. No idea why it passes on the buildbots and fails on my machine. Everything mentioned above happened on macOS. I didn't try on Linux yet. All other tests pass. Nathan