From a4bf2e2b9910c61c4dbdd71c210a5b0e427988b0 Mon Sep 17 00:00:00 2001 From: rhysd Date: Thu, 30 Jan 2020 16:17:32 +0900 Subject: [PATCH] tests: fix command outputs includes \r\n on Windows --- tests/test_cli.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/test_cli.py b/tests/test_cli.py index 7709314..7007a20 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -14,6 +14,9 @@ from covimerage.cli import get_version_message +NEWLINE = '\n' if os.platform != 'win32' else '\r\n' + + def test_dunder_main_run(capfd): assert call([sys.executable, '-m', 'covimerage']) == 0 out, err = capfd.readouterr() @@ -293,7 +296,7 @@ def test_cli_run_report_fd(capfd, tmpdir, devnull): def test_cli_call(capfd): assert call(['covimerage', '--version']) == 0 out, err = capfd.readouterr() - assert out == get_version_message() + '\n' + assert out == get_version_message() + NEWLINE assert call(['covimerage', '--help']) == 0 out, err = capfd.readouterr() @@ -354,7 +357,7 @@ def test_cli_call_verbosity_fd(capfd): assert call(['covimerage', '-qq', 'write_coverage', os.devnull]) == 1 out, err = capfd.readouterr() assert out == '' - assert err == 'Error: No data to report.\n' + assert err == 'Error: No data to report.' + NEWLINE def test_cli_writecoverage_without_data(runner): @@ -662,7 +665,7 @@ def test_run_handles_exit_code_from_python_fd(capfd): 'python', '-c', 'print("output"); import sys; sys.exit(42)']) out, err = capfd.readouterr() assert 'Error: Command exited non-zero: 42.' in err.splitlines() - assert out == 'output\n' + assert out == 'output' + NEWLINE assert ret == 42