subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1743538 - /subversion/trunk/subversion/tests/cmdline/update_tests.py
Date Thu, 12 May 2016 18:28:42 GMT
Author: stefan2
Date: Thu May 12 18:28:42 2016
New Revision: 1743538

URL: http://svn.apache.org/viewvc?rev=1743538&view=rev
Log:
Try fixing one of the Windows test failues with non-native EOL.

* subversion/tests/cmdline/update_tests.py
  (conflict_markers_matching_eol): Since we keep EOLs as are, modifying them
                                   on Windows alone should be unnecessary.

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

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1743538&r1=1743537&r2=1743538&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu May 12 18:28:42 2016
@@ -1652,10 +1652,10 @@ def conflict_markers_matching_eol(sbox):
 
   # CRLF is a string that will match a CRLF sequence read from a text file.
   # ### On Windows, we assume CRLF will be read as LF, so it's a poor test.
-  if os.name == 'nt':
-    crlf = '\n'
-  else:
-    crlf = '\r\n'
+#  if os.name == 'nt':
+#    crlf = '\n'
+#  else:
+#    crlf = '\r\n'
 
   # Checkout a second working copy
   wc_backup = sbox.add_wc_path('backup')



Mime
View raw message