|
13 | 13 | from covimerage import DEFAULT_COVERAGE_DATA_FILE, cli, get_version
|
14 | 14 | from covimerage.cli import get_version_message
|
15 | 15 |
|
| 16 | +NEWLINE = '\n' if sys.platform != 'win32' else '\r\n' |
| 17 | + |
16 | 18 |
|
17 | 19 | def test_dunder_main_run(capfd):
|
18 | 20 | assert call([sys.executable, '-m', 'covimerage']) == 0
|
@@ -293,7 +295,7 @@ def test_cli_run_report_fd(capfd, tmpdir, devnull):
|
293 | 295 | def test_cli_call(capfd):
|
294 | 296 | assert call(['covimerage', '--version']) == 0
|
295 | 297 | out, err = capfd.readouterr()
|
296 |
| - assert out == get_version_message() + '\n' |
| 298 | + assert out == get_version_message() + NEWLINE |
297 | 299 |
|
298 | 300 | assert call(['covimerage', '--help']) == 0
|
299 | 301 | out, err = capfd.readouterr()
|
@@ -354,7 +356,7 @@ def test_cli_call_verbosity_fd(capfd):
|
354 | 356 | assert call(['covimerage', '-qq', 'write_coverage', os.devnull]) == 1
|
355 | 357 | out, err = capfd.readouterr()
|
356 | 358 | assert out == ''
|
357 |
| - assert err == 'Error: No data to report.\n' |
| 359 | + assert err == 'Error: No data to report.' + NEWLINE |
358 | 360 |
|
359 | 361 |
|
360 | 362 | def test_cli_writecoverage_without_data(runner):
|
@@ -662,7 +664,7 @@ def test_run_handles_exit_code_from_python_fd(capfd):
|
662 | 664 | 'python', '-c', 'print("output"); import sys; sys.exit(42)'])
|
663 | 665 | out, err = capfd.readouterr()
|
664 | 666 | assert 'Error: Command exited non-zero: 42.' in err.splitlines()
|
665 |
| - assert out == 'output\n' |
| 667 | + assert out == 'output' + NEWLINE |
666 | 668 | assert ret == 42
|
667 | 669 |
|
668 | 670 |
|
|
0 commit comments