On the 'issue-3148-dev' branch: Make the test suite pass.

* subversion/tests/cmdline/externals_tests.py
  (old_style_externals_ignore_peg_reg, 
   can_place_file_external_into_dir_external): Expect new externals warnings.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-3148-dev@875204 13f79535-47bb-0310-9956-ffa450edef68

subversion/tests/cmdline/externals_tests.py

diff --git a/subversion/tests/cmdline/externals_tests.py b/subversion/tests/cmdline/externals_tests.py
index b94faf9..f7c6e9b 100755
--- a/subversion/tests/cmdline/externals_tests.py
+++ b/subversion/tests/cmdline/externals_tests.py
@@ -972,13 +972,18 @@
   # Set and commit the property.
   change_external(os.path.join(wc_dir, "A"), ext)
 
-  # Update the working copy.  This should fail because the URL with
-  # '@HEAD' does not exist.
-  svntest.actions.run_and_verify_svn("External '%s' used pegs" % ext.strip(),
-                                     None,
-                                     ".*URL .*/A/D/G@HEAD' .* doesn't exist",
-                                     'up',
-                                     wc_dir)
+  # Update the working copy.  This should succeed (exitcode 0) but
+  # should print warnings on the external because the URL with '@HEAD'
+  # does not exist.
+  expected_error = "|".join([".*Error handling externals definition.*",
+                             ".*URL .*/A/D/G@HEAD' .* doesn't exist.*",
+                             ])
+  svntest.actions.run_and_verify_svn2("External '%s' used pegs" % ext.strip(),
+                                      None,
+                                      expected_error,
+                                      0,
+                                      'up',
+                                      wc_dir)
 
 
 #----------------------------------------------------------------------
@@ -1088,13 +1093,17 @@
         "^/A/B/E/beta C/exdir_B/beta\n"
   change_external(os.path.join(wc_dir, 'A'), ext)
 
-  svntest.actions.run_and_verify_svn("Able to put file external in foreign wc",
-                                     None,
-                                     ".*Cannot insert a file external from "
-                                     ".*/beta' into a working copy "
-                                     ".*" + other_repo_url,
-                                     'up',
-                                     repo_url, wc_dir)
+  expected_error = "|".join([".*Error handling externals definition.*",
+                             ".*Cannot insert a file external from " \
+                             + ".*/beta' into a working copy " \
+                             + ".*" + other_repo_url,
+                             ])
+  svntest.actions.run_and_verify_svn2("Able to put file external in foreign wc",
+                                      None,
+                                      expected_error,
+                                      0,
+                                      'up',
+                                      repo_url, wc_dir)
 
 #----------------------------------------------------------------------