Skip to content

Add some alternative line endings and whitespace checks #2490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 12, 2022
Merged

Add some alternative line endings and whitespace checks #2490

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de8d0d1
Add some alternative line endings and trailing whitespace
peternewman Sep 4, 2022
7fe711d
Ignore line length on tests
peternewman Sep 4, 2022
c476307
Fix the assertion error count too
peternewman Sep 4, 2022
49b0ac0
Apply suggestions from code review
peternewman Sep 6, 2022
26ba797
Fix the line ending tests
peternewman Sep 6, 2022
7448b33
Make sure we write out with the correct newline setting
peternewman Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions codespell_lib/tests/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ def test_basic(tmpdir, capsys):
assert 'cannot find dictionary' in stderr
os.remove(fname)

with open(op.join(d, 'bad.txt'), 'w') as f:
f.write('abandonned\nAbandonned\nABANDONNED\nAbAnDoNnEd')
assert cs.main(d) == 4
with open(op.join(d, 'bad.txt'), 'w', newline='') as f:
f.write('abandonned\nAbandonned\nABANDONNED\nAbAnDoNnEd\nabandonned\rAbandonned\r\nABANDONNED \n AbAnDoNnEd') # noqa: E501
assert cs.main(d) == 8
code, _, stderr = cs.main('-w', d, std=True)
assert code == 0
assert 'FIXED:' in stderr
with open(op.join(d, 'bad.txt')) as f:
with open(op.join(d, 'bad.txt'), newline='') as f:
new_content = f.read()
assert cs.main(d) == 0
assert new_content == 'abandoned\nAbandoned\nABANDONED\nabandoned'
assert new_content == 'abandoned\nAbandoned\nABANDONED\nabandoned\nabandoned\rAbandoned\r\nABANDONED \n abandoned' # noqa: E501

with open(op.join(d, 'bad.txt'), 'w') as f:
f.write('abandonned abandonned\n')
Expand Down