From 7eeabb24675a0dddc5e07a47a30ad84f8ec2edec Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Sep 2015 19:52:56 +0200 Subject: [PATCH] Fix integration tests with CRLF. --- tests/integration/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index bd1353985..75389604d 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -101,7 +101,7 @@ class HTTPBin(QObject): """Read the log from httpbin's stdout and parse it.""" while self.proc.canReadLine(): line = self.proc.readLine() - line = bytes(line).decode('utf-8').rstrip('\n') + line = bytes(line).decode('utf-8').rstrip('\r\n') print(line) if line == (' * Running on http://127.0.0.1:{}/ (Press CTRL+C to '