Index: subversion/tests/clients/cmdline/copy_tests.py =================================================================== --- subversion/tests/clients/cmdline/copy_tests.py (revision 13736) +++ subversion/tests/clients/cmdline/copy_tests.py (working copy) @@ -1482,19 +1482,23 @@ sbox.build() wc_dir = sbox.wc_dir - - dirURL1 = svntest.main.current_repo_url + "/A/B/E" - dirURL2 = svntest.main.current_repo_url + "/G/C/E/I" - + + dirURL1 = svntest.main.current_repo_url + "/A/B/E" + dirURL2 = svntest.main.current_repo_url + "/G/C/E/I" + msg = ".*: Path 'G' not present" + # Expect failure on 'svn cp SRC DST' where one or more ancestor # directories of DST do not exist - svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput, - 'cp', dirURL1, dirURL2, - '--username', svntest.main.wc_author, - '--password', svntest.main.wc_passwd, - '-m', 'fooogle') + out, err = svntest.main.run_svn(1, + 'cp', dirURL1, dirURL2, + '-m', 'marina') + for err_line in err: + if re.match (msg, err_line): + break + else: + print "Error:\n" + msg + "\nnot found in error output:\n" + str(err) + raise svntest.Failure - ######################################################################## # Run the tests