Skip to content

Commit 78cfb0c

Browse files
committed
tests: fix command outputs includes \r\n on Windows
1 parent 8008a17 commit 78cfb0c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tests/test_cli.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
from covimerage import DEFAULT_COVERAGE_DATA_FILE, cli, get_version
1414
from covimerage.cli import get_version_message
1515

16+
NEWLINE = '\n' if sys.platform != 'win32' else '\r\n'
17+
1618

1719
def test_dunder_main_run(capfd):
1820
assert call([sys.executable, '-m', 'covimerage']) == 0
@@ -293,7 +295,7 @@ def test_cli_run_report_fd(capfd, tmpdir, devnull):
293295
def test_cli_call(capfd):
294296
assert call(['covimerage', '--version']) == 0
295297
out, err = capfd.readouterr()
296-
assert out == get_version_message() + '\n'
298+
assert out == get_version_message() + NEWLINE
297299

298300
assert call(['covimerage', '--help']) == 0
299301
out, err = capfd.readouterr()
@@ -354,7 +356,7 @@ def test_cli_call_verbosity_fd(capfd):
354356
assert call(['covimerage', '-qq', 'write_coverage', os.devnull]) == 1
355357
out, err = capfd.readouterr()
356358
assert out == ''
357-
assert err == 'Error: No data to report.\n'
359+
assert err == 'Error: No data to report.' + NEWLINE
358360

359361

360362
def test_cli_writecoverage_without_data(runner):
@@ -662,7 +664,7 @@ def test_run_handles_exit_code_from_python_fd(capfd):
662664
'python', '-c', 'print("output"); import sys; sys.exit(42)'])
663665
out, err = capfd.readouterr()
664666
assert 'Error: Command exited non-zero: 42.' in err.splitlines()
665-
assert out == 'output\n'
667+
assert out == 'output' + NEWLINE
666668
assert ret == 42
667669

668670

0 commit comments

Comments
 (0)