/[Apache-SVN]
ViewVC logotype

Revision 1878142


Jump to revision: Previous Next
Author: futatuki
Date: Tue May 26 23:49:08 2020 UTC (3 years, 10 months ago)
Changed paths: 4
Log Message:
Fix eol style treatment in command tests on Windows.

[in subversion/tests/cmdline]

* merge_tests.py (merge_conflict_markers_matching_eol,
                  merge_eolstyle_handling),
* patch_tests.py (patch_no_svn_eol_style,
                  patch_with_svn_eol_style,
                  patch_with_svn_eol_style_uncommitted),
* update_tests.py (conflict_markers_matching_eol,
                   update_eol_style_handling):
  Specify keep_eol_style = True evne if platform is Windows.

* merge_tests.py (merge_conflict_markers_matching_eol),
* patch_tests.py (patch_no_svn_eol_style,
                  patch_with_svn_eol_style,
                  patch_with_svn_eol_style_uncommitted),
* update_tests.py (conflict_markers_matching_eol):
  Use binary mode to write file contents for strict eol style.

* merge_tests.py (merge_conflict_markers_matching_eol),
* patch_tests.py (patch_with_svn_eol_style,
                  patch_with_svn_eol_style_uncommitted),
* conflict_markers_matching_eol):
  Switch per platform eol value for 'native' svn:eol-style

* svntest/wc.py (State.from_wc):
  Use io.open() explicitly to specify 'newline' parameter for universal
  newline, even on Python 2.  With this change, '\r' end of line chracters in
  files are also translated to '\n' if keep_eol_style=False (or unspicified)
  on Python 2.  Also explicitly specify encoding to 'utf-8' not to be affected
  by Python's file system encoding.

Reported by: jcorvel
Tested by: jcorvel


Changed paths

Path Details
Directorysubversion/trunk/subversion/tests/cmdline/merge_tests.py modified , text changed
Directorysubversion/trunk/subversion/tests/cmdline/patch_tests.py modified , text changed
Directorysubversion/trunk/subversion/tests/cmdline/svntest/wc.py modified , text changed
Directorysubversion/trunk/subversion/tests/cmdline/update_tests.py modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26