Author: rhuijben
Date: Thu Jul 29 15:53:14 2010
New Revision: 980486
URL: http://svn.apache.org/viewvc?rev=980486&view=rev
Log:
Update another tests expected behavior for single-db: fixing copy_tests.py 46
"move a moved dir back to original location" for single-db.
* subversion/tests/cmdline/copy_tests.py
(move_dir_back_and_forth): Assume this just works for single-db.
Modified:
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=980486&r1=980485&r2=980486&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Thu Jul 29 15:53:14
2010
@@ -2461,16 +2461,18 @@ def move_dir_back_and_forth(sbox):
# Move the moved dir: D_moved back to its starting
# location at A/D.
- exit_code, out, err = svntest.actions.run_and_verify_svn(
- None, None, svntest.verify.AnyOutput,
- 'mv', D_move_path, D_path)
-
- for line in err:
- if re.match('.*Cannot copy to .*as it is scheduled for deletion',
- line, ):
- return
- raise svntest.Failure("mv failed but not in the expected way")
+ if svntest.main.wc_is_singledb(wc_dir):
+ # In single-db target is gone on-disk after it was moved away, so this
+ # move works ok
+ expected_err = []
+ else:
+ # In !SINGLE_DB the target of the copy exists on-dir, so svn tries
+ # to move the file below the deleted directory
+ expected_err = '.*Cannot copy to .*as it is scheduled for deletion'
+
+ svntest.actions.run_and_verify_svn(None, None, expected_err,
+ 'mv', D_move_path, D_path)
def copy_move_added_paths(sbox):
"copy and move added paths without commits"
