[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r922511 - /subversion/trunk/subversion/libsvn_client/commit.c

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Sun, 14 Mar 2010 19:37:29 +0000

"Bert Huijben" <bert_at_qqmail.nl> writes:

> http://buildbot.subversion.org/buildbot/waterfall still says that the svn x
> fsfs build testsuite is broken.
> (This buildbot uses a recent trunk for checking out the build working
> copy... that could make a difference for the specific test)

$ cd subversion/tests/cmdline
$ ../../../../src/subversion/tests/cmdline/commit_tests.py --url svn://localhost 27
PASS: commit_tests.py 27: committing two WCs from different repos fails
$ cp -a ../../../wc/.svn .
$ ../../../../src/subversion/tests/cmdline/commit_tests.py --url svn://localhost 27
Expected output on stderr doesn't match
EXPECTED STDERR (regexp):
.*is not a working copy.*
ACTUAL STDERR:
../src/subversion/svn/commit-cmd.c:142: (apr_err=155004)
../src/subversion/libsvn_client/commit.c:1172: (apr_err=155004)
../src/subversion/libsvn_client/commit.c:1028: (apr_err=155004)
svn: Are all targets part of the same working copy?
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
EXCEPTION: SVNUnmatchedError
Traceback (most recent call last):
  File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/main.py", line 1197, in run
    rc = self.pred.run(sandbox)
  File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/testcase.py", line 160, in run
    return self.func(sandbox)
  File "../../../../src/subversion/tests/cmdline/commit_tests.py", line 1502, in commit_multiple_wc_multiple_repos
    wc1_dir, wc2_dir)
  File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/actions.py", line 223, in run_and_verify_svn
    expected_exit, *varargs)
  File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/actions.py", line 262, in run_and_verify_svn2
    verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
  File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/verify.py", line 342, in verify_outputs
    compare_and_display_lines(message, label, expected, actual, raisable)
  File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/verify.py", line 315, in compare_and_display_lines
    raise raisable
SVNUnmatchedError
FAIL: commit_tests.py 27: committing two WCs from different repos fails

The test code is:

  # Commit should fail, since WCs come from different repositories.
  svntest.actions.run_and_verify_svn("Expected output on stderr doesn't match",
                                     [], ".*is not a working copy.*",
                                     'commit', '-m', 'log',
                                     wc1_dir, wc2_dir)

It's unfortunate that we gets different error messages depending on
whether there is a different working copy somewhere further up the
tree. However the error message "are all targets part of the same
working copy" looks perfectly sensible. Perhaps the test should
accept both?

-- 
Philip
Received on 2010-03-14 20:38:00 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.