Author: rhuijben
Date: Fri Feb 27 22:51:28 2015
New Revision: 1662842
URL: http://svn.apache.org/r1662842
Log:
Following up on r1662838, fix another deeptrees scenarios for the stderr
changes in the run_and_verify_(update|switch|merge)() functions.
* subversion/tests/cmdline/svntest/deeptrees.py
(deep_trees_run_tests_scheme_for_switch): Tweak expected_stderr generation.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py?rev=1662842&r1=1662841&r2=1662842&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py Fri Feb 27
22:51:28 2015
@@ -754,8 +754,13 @@ def deep_trees_run_tests_scheme_for_swit
x_status.copy()
x_status.wc_dir = local
+ if test_case.error_re_string == None:
+ expected_stderr = []
+ else:
+ expected_stderr = test_case.error_re_string
+
run_and_verify_switch(local, local, incoming, x_out, x_disk, None,
- test_case.error_re_string, False,
+ expected_stderr, False,
'--ignore-ancestry')
run_and_verify_unquiet_status(local, x_status)
