subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1126643 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Date Mon, 23 May 2011 18:33:59 GMT
Author: stsp
Date: Mon May 23 18:33:59 2011
New Revision: 1126643

URL: http://svn.apache.org/viewvc?rev=1126643&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Always use absolute URLs in command line
    arguments to prevent this test from failing in some environments.

Found by: philip

Modified:
    subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1126643&r1=1126642&r2=1126643&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Mon May 23 18:33:59 2011
@@ -1239,7 +1239,7 @@ def actual_only_node_behaviour(sbox):
   expected_stderr = ".*foo.*does not exist.*"
   run_and_verify_svn(None, expected_stdout, expected_stderr,
                      "merge", '--ignore-ancestry', '-c', '4',
-                     '^/trunk/alpha', foo_path)
+                     A_copy_url + '/mu', foo_path)
 
   # mergeinfo
   expected_stdout = None
@@ -1311,7 +1311,7 @@ def actual_only_node_behaviour(sbox):
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
   run_and_verify_svn(None, expected_stdout, expected_stderr,
-                     "relocate", "^/A_copy/foo", foo_path)
+                     "relocate", A_copy_url + "/foo", foo_path)
 
   # resolve
   expected_stdout = "Resolved conflicted state of.*foo.*"
@@ -1347,7 +1347,7 @@ def actual_only_node_behaviour(sbox):
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
   run_and_verify_svn(None, expected_stdout, expected_stderr,
-                     "switch", "^/A_copy/foo", foo_path)
+                     "switch", A_copy_url + "/foo", foo_path)
 
   # unlock
   expected_stdout = None



Mime
View raw message