subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1154938 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py
Date Mon, 08 Aug 2011 12:11:06 GMT
Author: stsp
Date: Mon Aug  8 12:11:06 2011
New Revision: 1154938

URL: http://svn.apache.org/viewvc?rev=1154938&view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
  (commit_copied_half_of_move, commit_deleted_half_of_move): Verify moved-to
   and moved-from paths shown in error messages.

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=1154938&r1=1154937&r2=1154938&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Aug  8 12:11:06 2011
@@ -5482,7 +5482,9 @@ def commit_copied_half_of_move(sbox):
 
   svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path)
 
-  expected_error = "svn: E200009: Cannot commit"
+  expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \
+                    "from '.*%s'" % (re.escape(os.path.join(D_path, "iota")),
+                                     re.escape(iota_path))
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'commit', '-m', 'foo', D_path)
 
@@ -5536,7 +5538,9 @@ def commit_deleted_half_of_move(sbox):
 
   svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path)
 
-  expected_error = "svn: E200009: Cannot commit"
+  expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \
+                    "to '.*%s'" % (re.escape(iota_path),
+                                   re.escape(os.path.join(D_path, "iota")))
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'commit', '-m', 'foo', iota_path)
 



Mime
View raw message