subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ne...@apache.org
Subject svn commit: r959738 - /subversion/trunk/subversion/tests/cmdline/switch_tests.py
Date Thu, 01 Jul 2010 18:21:58 GMT
Author: neels
Date: Thu Jul  1 18:21:57 2010
New Revision: 959738

URL: http://svn.apache.org/viewvc?rev=959738&view=rev
Log:
Follow-up on r959735.

* subversion/tests/cmdline/switch_tests.py
  (forced_switch_failures):
    Remove a unix-EOL that caused an expected-output mismatch on windows.

Modified:
    subversion/trunk/subversion/tests/cmdline/switch_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=959738&r1=959737&r2=959738&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Thu Jul  1 18:21:57 2010
@@ -1349,7 +1349,7 @@ def forced_switch_failures(sbox):
   #    directory of the same name already exists.  (Currently fails)
   # svn switch --force url/A/D A/C
   expected_error = ('Failed to add directory.*' + A_C_H +
-                    '.*a non-directory object.*already exists\n')
+                    '.*a non-directory object.*already exists')
 
   actions.run_and_verify_switch(wc_dir, A_C, url_A_D, None, None, None,
     expected_error, None, None, None, None, False, '--force')



Mime
View raw message