Re: Problems running testsuite on Windows with Python 3

On 2020/04/23 2:05, Yasuhito FUTATSUKI wrote:
> On 2020/04/22 23:04, Johan Corveleyn wrote:
>> On Wed, Apr 22, 2020 at 3:50 PM Yasuhito FUTATSUKI <futatuki_at_poem.co.jp> wrote:
>
>>> ... and what is worse, at least
>>>
>>>> FAIL: merge_tests.py 34: conflict markers should match the file's eol style
>>>
>>> this one seems to be broken even with Python 2.7, on Windows.
>>> (I'll post about it later).
>>
>> That's strange. It does succeed on my system when running with Python
>> 2.7.17. I had "All successful" test runs for [fsfs] x [ra_local,
>> ra_serf, ra_svn].
>
> Yes, I don't doubt this test is passed on Windows with Python 2.7,
> but I doubt this test does not check just what we want to check.
>
> As far as I read the description of the test and about KEEP_EOL_STYLE
> option introduced in r1743445.
>
> merge_tests.py (merge_conflict_markers_matching_eol):
> [[[
> # eol-style handling during merge with conflicts, scenario 1:
> # when a merge creates a conflict on a file, make sure the file and files
> # r<left>, r<right> and .mine are in the eol-style defined for that file.
> ]]]
>
> So I think comparion of expected and actual should be done without
> eol-style translation. However it try to check with translation on
> Windows environment.

It seems following tests are EOL style sensitive, but they didn't
check without strict EOL style on Windows:

  merge_tests.merge_conflict_markers_matching_eol
  merge_tests.merge_eolstyle_handling
  patch_tests.patch_no_svn_eol_style
  patch_tests.patch_with_svn_eol_style
  patch_tests.patch_with_svn_eol_style_uncommitted
  update_tests.conflict_markers_matching_eol
  update_tests.update_eol_style_handling

I've not check that each tests depend that native EOL is '\n' or not.
However, I think if some tests depend on it, other test cases for
those aims are needed on Windows, or at least explicitly skip the tests
on Windows to clarify that those tests check nothing for the aims.

The updated patch attached only make these tests EOL style sensitive
(and relax check of EOL on Python 2 if keep_eol_style optional
parameter is not specified).

Cheers,

-- 
Yasuhito FUTATSUKI <futatuki_at_poem.co.jp>/<futatuki_at_yf.bsdclub.org>