svn commit: r922934 - /subversion/trunk/subversion/tests/cmdline/commit_tests.py

[ph...@apache.org]

Author: philip
Date: Sun Mar 14 19:48:23 2010
New Revision: 922934

URL: http://svn.apache.org/viewvc?rev=922934&view=rev
Log:
* subversion/tests/cmdline/commit_tests.py
  (commit_multiple_wc_multiple_repos): Accept one of two errors.

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

Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=922934&r1=922933&r2=922934&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Sun Mar 14 19:48:23 2010
@@ -1496,8 +1496,11 @@ def commit_multiple_wc_multiple_repos(sb
   svntest.actions.run_and_verify_status(wc2_dir, expected_status2)
 
   # Commit should fail, since WCs come from different repositories.
+  # The exact error message depends on whether or not the tests are
+  # run below a 1.7 working copy
+  error_re = ".*(is not a|Are all targets part of the same) working copy.*"
   svntest.actions.run_and_verify_svn("Expected output on stderr doesn't match",
-                                     [], ".*is not a working copy.*",
+                                     [], error_re,
                                      'commit', '-m', 'log',
                                      wc1_dir, wc2_dir)