subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1302499 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Date Mon, 19 Mar 2012 15:06:21 GMT
Author: rhuijben
Date: Mon Mar 19 15:06:20 2012
New Revision: 1302499

URL: http://svn.apache.org/viewvc?rev=1302499&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Following up on r1302450, make error regex
    less strict.

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=1302499&r1=1302498&r2=1302499&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Mon Mar 19 15:06:20 2012
@@ -1216,7 +1216,7 @@ def actual_only_node_behaviour(sbox):
                      "export", foo_path, sbox.get_tempname())
   # import
   expected_stdout = None
-  expected_stderr = ".*foo.*does not exist.*"
+  expected_stderr = ".*(foo.*does not exist|Can't stat.*foo).*"
   run_and_verify_svn(None, expected_stdout, expected_stderr,
                      "import", '-m', svntest.main.make_log_msg(),
                      foo_path, sbox.repo_url + '/foo_imported')



Mime
View raw message