Author: rhuijben
Date: Fri Apr 1 09:58:38 2011
New Revision: 1087635
URL: http://svn.apache.org/viewvc?rev=1087635&view=rev
Log:
Fix cmdline tests when configured without --enable-maintainer-mode.
* subversion/tests/cmdline/cat_tests.py
(cat_skip_uncattable): Ignore additional lines of output from
error reporting in maintainer mode.
* subversion/tests/cmdline/basic_tests.py
(ls_multiple_and_non_existent_targets, add_multiple_targets,
info_multiple_targets, blame_multiple_targets): Ignore additional
lines of output from error reporting in maintainer mode.
Patch by: Uwe Stuehler <subversion-lists(_AT_)bsdx.de>
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/cat_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1087635&r1=1087634&r2=1087635&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Apr 1
09:58:38 2011
@@ -2739,8 +2739,8 @@ def ls_multiple_and_non_existent_targets
0, 'ls', alpha, beta)
# One non-existing target
- expected_err = ".*W155010.*\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*W155010.*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'ls', alpha,
non_existent_path, beta)
@@ -2762,8 +2762,8 @@ def ls_multiple_and_non_existent_targets
0, 'ls', alpha, beta)
# One non-existing target
- expected_err = ".*W160013.*\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*W160013.*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'ls', alpha,
non_existent_url, beta)
@@ -2792,8 +2792,8 @@ def add_multiple_targets(sbox):
svntest.main.file_write(file2, "file2 contents", 'w+')
# One non-existing target
- expected_err = ".*W155010.*\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*W155010.*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
# Build expected state
expected_output = wc.State(wc_dir, {
@@ -2834,8 +2834,8 @@ def info_multiple_targets(sbox):
0, 'info', alpha, beta)
# One non-existing target
- expected_err = ".*W155010.*\n\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*W155010.*\n\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'info', alpha,
non_existent_path, beta)
@@ -2857,8 +2857,8 @@ def info_multiple_targets(sbox):
0, 'info', alpha, beta)
# One non-existing target
- expected_err = ".*W170000.*\n\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*W170000.*\n\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'info', alpha,
non_existent_url, beta)
@@ -2891,8 +2891,8 @@ def blame_multiple_targets(sbox):
" 2 jrandom New contents for iota\n",
]
- expected_err = ".*W155010.*\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*W155010.*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'blame',
non_existent, iota)
@@ -2918,8 +2918,8 @@ def blame_multiple_targets(sbox):
" 2 jrandom New contents for iota\n",
]
- expected_err = ".*(W160017|W160013).*\n.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err)
+ expected_err = ".*(W160017|W160013).*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'blame',
non_existent, iota_url)
Modified: subversion/trunk/subversion/tests/cmdline/cat_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/cat_tests.py?rev=1087635&r1=1087634&r2=1087635&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/cat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/cat_tests.py Fri Apr 1 09:58:38
2011
@@ -159,9 +159,9 @@ def cat_skip_uncattable(sbox):
'cat', rho_path, new_file_path)
expected_err3 = expected_err1 + expected_err2 + \
- ".*\nsvn: E200009: Could not cat all targets because some targets " + \
+ ".*svn: E200009: Could not cat all targets because some targets " + \
"don't exist\n"
- expected_err_re = re.compile(expected_err3)
+ expected_err_re = re.compile(expected_err3, re.DOTALL)
exit_code, output, error = svntest.main.run_svn(1, 'cat', rho_path, G_path,
new_file_path)
