Regresssiontests.template tests fail on windows due to expected '\n'

[Michael Manfre]

======================================================================
FAIL: test_inclusion_tags (regressiontests.templates.custom.CustomTagTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\projects\django\tests\regressiontests\templates\custom.py", line 112, in test_inclusion_tags
    self.assertEqual(t.render(c), 'inclusion_no_params - Expected result\n')
AssertionError: u'inclusion_no_params - Expected result\r\n' != u'inclusion_no_params - Expected result\n'

======================================================================
FAIL: test_inclusion_tags_from_template (regressiontests.templates.custom.CustomTagTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\projects\django\tests\regressiontests\templates\custom.py", line 194, in test_inclusion_tags_from_template
    self.assertEqual(t.render(c), 'inclusion_no_params_from_template - Expected result\n')
AssertionError: u'inclusion_no_params_from_template - Expected result\r\n' != u'inclusion_no_params_from_template - Expected result\n'

======================================================================
FAIL: test_post_callbacks (regressiontests.templates.response.SimpleTemplateResponseTest)
Rendering a template response triggers the post-render callbacks
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\projects\django\tests\regressiontests\templates\response.py", line 145, in test_post_callbacks
    self.assertEqual(response.content, b'First template\n')
AssertionError: 'First template\r\n' != 'First template\n'

======================================================================
FAIL: test_template_resolving (regressiontests.templates.response.SimpleTemplateResponseTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\projects\django\tests\regressiontests\templates\response.py", line 34, in test_template_resolving
    self.assertEqual(response.content, b'First template\n')
AssertionError: 'First template\r\n' != 'First template\n'

[Michael Manfre]

Pull request.

​https://github.com/django/django/pull/330

[Claude Paroz]

On Python 3, you cannot concatenate bytes and str, so you will need to encode linesep (last three in your patch).

[anonymous]

Updated pull and now using force_bytes for the last three. I don't have a Python 3 environment to test it out right now.

[Claude Paroz]

#18926 was a duplicate, but it suggests another way of solving this (at git level with .gitattributes).

[Karen Tracey]

I do run the test suite on Windows, and have not run into this issue. Apparently when I installed git on Windows (git --version reports for me git version 1.7.10.msysgit.1), it either defaulted to setting core.autocrlf to input or I told it to do so. Ultimately I think that is the right approach: tell git to NOT alter line endings. If the .gitattributes file can help with that, we should add that as well. I don't think we should change the tests to account for different line endings on Windows/Linux/Mac (does Mac still have yet a different convention or have they changed to LF only?) because that is fragile: people will add new tests without remembering to account for line ending differences across platforms and those tests will break on non-Linux platforms. Instead we should document that if you are using git on Windows you should configure git to have core.autocrlf set to input and/or include a .gitattbutes file that prevents the "wrong" setting for this value from causing problems.

[Claude Paroz]

What about tests run not from git checkout but with a downloaded tarball?

[Karen Tracey]

Those don't have any problem...the problem is introduced by git configurations which change LF in the files in the repo to CRLF on Windows.

[Karen Tracey]

Which, now that you mention it, is another reason to not change the tests. If we change the tests to expect CRLF line endings when running on Windows then people who download the tarball to Windows and run tests from that install will see errors, because going that route doesn't auto-convert line endings to CRLF.

[Julien Phalip]

Adding a .gitattributes file to the repository, as suggested in #18926, would seem like the best approach, as this is clearly an issue with git/github, not the code or tests.

[MaxV]

Sample gitattributes file from #18926

[MaxV]

I figured that if #18926 is a duplicate, then the suggested .gitattributes file that dlanger added and tested there seems like a possible solution here. I will test the solution on Windows shortly. If we do add the .gitattributes file, I think it is necessary to document the change somewhere and possibly adding a note about Windows Git and line endings to the ​installation docs.

Does anyone think that it would be very intrusive to force LF line endings on all html files in Django? Seems to be a reasonable way to ensure a consistent user testing experience with regards to line endings.

[MaxV]

Tested and confirmed that adding .gitattributes file to repo before clone fixes aforementioned unit tests. Used Windows Git-1.8.0-preview20121022 and Django master.

[Julien Phalip <jphalip@…>]

In 978d4476cf1956fe91a2a6b3b5d2157005560c33:

Fixed #18920 -- Added .gitattributes to normalize line endings in HTML templates and avoid spurious failures in the core test suite on Windows. Many thanks to manfre, Claude Paroz, Karen Tracey, MaxV and Daniel Langer for their advising and testing.

[Julien Phalip <jphalip@…>]

In 49484b54bc26122257ac73b059897870d6ef716f:

[1.5.x] Fixed #18920 -- Added .gitattributes to normalize line endings in HTML templates and avoid spurious failures in the core test suite on Windows. Many thanks to manfre, Claude Paroz, Karen Tracey, MaxV and Daniel Langer for their advising and testing.

[Ramiro Morales <cramm0@…>]

In 4372718e839d15c707d50cc78274a355258cf36a:

Force Unix-style line-endings for some helper files in staticfiles_tests.

This fixes eight failures in the cached storage tests under Windows.

Refs #18920 and 978d4476cf.

[Ramiro Morales <cramm0@…>]

In 47a65ad40e6b6ee282a46473977b774837950961:

[1.6.x] Force Unix-style line-endings for some helper files in staticfiles_tests.

This fixes eight failures in the cached storage tests under Windows.

Refs #18920 and 978d4476cf.

4372718e83 from master.