Den fre 6 okt. 2023 kl 06:26 skrev Nathan Hartman <hartman.nat...@gmail.com >:
> On Mon, May 29, 2023 at 10:47 PM Jun Omae <jun6...@gmail.com> wrote: > > > > On 2023/05/29 20:09, Daniel Sahlberg wrote: > [...] > > > > > > The following patch could fix it and verified (applying > `re.escape` to the paths). > [...] > > I'm running into a strange failure with the above test (copy_tests.py > 17: move WC WC/subdir). The paths we construct for expected_error are > not matching the actual error in my system. I tried various things but > nothing seems to help. > > Looking around the testsuite, I tried changing '%s' to '.*%s'; also I > tried removing os.path.abspath when constructing from_path and > to_path; I made various other attempts, all aimed at minimally > matching the known portion of the path while ignoring the extra stuff. > Unfortunately I was not successful. > > This is on trunk, as of r1912743 (the latest right now), Linux Debian, > Python 3.7.5, building SVN with --enable-maintainer-mode (this might > account for some extra text in the actual error message?). > I also build with --enable-maintainer-mode and it has not caused problems for me previously. > > All other tests are passing for me, for all [local|svn|serf] x [fsfs]. > > Fail log: > > [[[ > W: Unexpected output > W: EXPECTED STDERR (regexp, match_all=False): > W: | svn: E200007: Cannot move path > > '/home/nathan/ramdrive/svndev/svn\-trunk/subversion/tests/cmdline/svn\-test\-work/working_copies/copy_tests\-17' > into its own child > > '/home/nathan/ramdrive/svndev/svn\-trunk/subversion/tests/cmdline/svn\-test\-work/working_copies/copy_tests\-17/F/B' > Note the "\-", ie escaping of the - character. Can you check if removing the re.escape (reverting r1910129) helps? Since you are on *nix, the re.escape should not be needed (it was only there to account for the \ path separator in Windows). W: ACTUAL STDERR: > W: | subversion/svn/move-cmd.c:102, > W: | subversion/svn/util.c:557, > W: | subversion/libsvn_client/copy.c:3495, > W: | subversion/libsvn_client/copy.c:3093: > (apr_err=SVN_ERR_UNSUPPORTED_FEATURE) > W: | svn: E200007: Cannot move path > > '/home/nathan/ramdrive/svndev/ramdisk/svn-trunk/working_copies/copy_tests-17' > into its own child > > '/home/nathan/ramdrive/svndev/ramdisk/svn-trunk/working_copies/copy_tests-17/F/B' > W: CWD: > /home/nathan/ramdrive/svndev/ramdisk/svn-trunk/working_copies/copy_tests-17 > Note the extra "/ramdisk" here, between svndev and svn-trunk, missing from the expected error previously. What is the actual layout of your system? Do you have any specific arguments when starting the test suite affecting the location of the test-repo/wc:s? > W: EXCEPTION: SVNUnmatchedError > Traceback (most recent call last): > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/main.py", > line 1996, in run > No "ramdisk" here... > rc = self.pred.run(sandbox) > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/testcase.py", > line 178, in run > result = self.func(sandbox) > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/copy_tests.py", > line 1299, in wc_move_parent_into_child > '.', 'F/B') > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/actions.py", > line 340, in run_and_verify_svn > expected_exit, *varargs) > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/actions.py", > line 380, in run_and_verify_svn2 > expected_stdout, expected_stderr) > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/verify.py", > line 532, in verify_outputs > compare_and_display_lines(message, label, expected, actual, raisable) > File > "/home/nathan/ramdrive/svndev/svn-trunk/subversion/tests/cmdline/svntest/verify.py", > line 505, in compare_and_display_lines > raise raisable > svntest.main.SVNUnmatchedError > FAIL: copy_tests.py 17: move WC WC/subdir > ]]] > > Any ideas? > > Cheers, > Nathan > Kind regards, Daniel
