Re: Fix cmdline tests when configured without --enable-maintainer-mode

On 04/ 1/11 12:31 AM, Uwe Stuehler wrote:
> Hi everyone,

Sorry everyone, my mail client wrapped it without telling me. >:-|

Here's the same patch again, and it hopefully applies cleanly now.
(Just in case, I've also attached it as a .txt file)

Cheers

[[
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>
]]

Index: subversion/tests/cmdline/cat_tests.py
===================================================================
--- subversion/tests/cmdline/cat_tests.py (revision 1087424)
+++ subversion/tests/cmdline/cat_tests.py (working copy)
@@ -159,9 +159,9 @@
                                        '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)
 
Index: subversion/tests/cmdline/basic_tests.py
===================================================================
--- subversion/tests/cmdline/basic_tests.py (revision 1087424)
+++ subversion/tests/cmdline/basic_tests.py (working copy)
@@ -2739,8 +2739,8 @@
                                         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 @@
                                         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 @@
   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 @@
                                         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 @@
                                         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 @@
       " 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 @@
       " 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)