svn commit: r1563067 - /subversion/trunk/subversion/tests/cmdline/diff_tests.py

[br...@apache.org]

Author: breser
Date: Fri Jan 31 06:27:04 2014
New Revision: 1563067

URL: http://svn.apache.org/r1563067
Log:
Followup to r1563066, fix test failures on Windows.

* subversion/tests/cmdline/diff_tests.py
  (diff_repo-wc_file_props): Overthought how to test eol-style, the file
    is already in LF style.

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

Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1563067&r1=1563066&r2=1563067&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Jan 31 06:27:04 2014
@@ -4745,33 +4745,24 @@ def diff_repo_wc_file_props(sbox):
                                      '--old', iota_copy,
                                      '--new', iota + '@1')
 
-  # revert and commit with the eol-style of native and then update so
+  # revert and commit with the eol-style of LF and then update so
   # that we can see a change on either windows or *nix.
   sbox.simple_revert('iota', 'iota_copy')
-  sbox.simple_propset('svn:eol-style', 'native', 'iota')
+  sbox.simple_propset('svn:eol-style', 'LF', 'iota')
   sbox.simple_commit() #r2
   sbox.simple_update()
 
-  # now that we have a native file on disk switch to the opposing
-  # style from native
-  if svntest.main.is_os_windows():
-    native_eol = '\r\n'
-    foreign_eol = '\n'
-    foreign_eol_style = 'LF'
-  else:
-    native_eol = '\n'
-    foreign_eol = '\r\n'
-    foreign_eol_style = 'CRLF'
-  sbox.simple_propset('svn:eol-style', foreign_eol_style, 'iota')
+  # now that we have a LF file on disk switch to CRLF
+  sbox.simple_propset('svn:eol-style', 'CRLF', 'iota')
 
   # test that not only the property but also the file changes
   # i.e. that the line endings substitution works
   expected_output = make_diff_header(iota, 'revision 1', 'working copy') + \
                     [ '@@ -1 +1 @@\n',
-                      "-This is the file 'iota'." + native_eol,
-                      "+This is the file 'iota'." + foreign_eol ] + \
+                      "-This is the file 'iota'.\n",
+                      "+This is the file 'iota'.\r\n" ] + \
                     make_diff_prop_header(iota) + \
-                    make_diff_prop_added('svn:eol-style', foreign_eol_style)
+                    make_diff_prop_added('svn:eol-style', 'CRLF')
 
   svntest.actions.run_and_verify_svn(None, expected_output, [],
                                      'diff', '-r1', iota)