From d24f76c98e9673d4c66121c007080a62a0998569 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Wed, 25 Jan 2017 18:36:43 +0100 Subject: fix newlines on windows --- test/mitmproxy/addons/test_termlog.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/addons/test_termlog.py b/test/mitmproxy/addons/test_termlog.py index e21aecec..70c3a7f2 100644 --- a/test/mitmproxy/addons/test_termlog.py +++ b/test/mitmproxy/addons/test_termlog.py @@ -10,9 +10,9 @@ from mitmproxy.test import taddons class TestTermLog: @pytest.mark.usefixtures('capfd') @pytest.mark.parametrize('outfile, expected_out, expected_err', [ - (None, 'one\nthree\n', 'four\n'), - (sys.stdout, 'one\nthree\nfour\n', ''), - (sys.stderr, '', 'one\nthree\nfour\n'), + (None, ['one', 'three'], ['four']), + (sys.stdout, ['one', 'three', 'four'], []), + (sys.stderr, [], ['one', 'three', 'four']), ]) def test_output(self, outfile, expected_out, expected_err, capfd): t = termlog.TermLog(outfile=outfile) @@ -23,5 +23,5 @@ class TestTermLog: t.log(log.LogEntry("three", "warn")) t.log(log.LogEntry("four", "error")) out, err = capfd.readouterr() - assert out == expected_out - assert err == expected_err + assert out.strip().splitlines() == expected_out + assert err.strip().splitlines() == expected_err -- cgit v1.2.3