From 0d093c45df583bed9400004bebd2f3becaa7523d Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 7 May 2021 10:06:12 -0400 Subject: [PATCH] Test fails on Python 3, instead of spinning until timeout. --- integration/conftest.py | 2 +- integration/test_servers_of_happiness.py | 2 +- integration/util.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index 533cbdb67..918f2d4c9 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -28,7 +28,7 @@ from twisted.internet.error import ( import pytest import pytest_twisted -from util import ( +from .util import ( _CollectOutputProtocol, _MagicTextProtocol, _DumpOutputProtocol, diff --git a/integration/test_servers_of_happiness.py b/integration/test_servers_of_happiness.py index 1f350eb8e..f8f69b1cc 100644 --- a/integration/test_servers_of_happiness.py +++ b/integration/test_servers_of_happiness.py @@ -3,7 +3,7 @@ from os.path import join from twisted.internet.error import ProcessTerminated -import util +from . import util import pytest_twisted diff --git a/integration/util.py b/integration/util.py index cd7f15e84..2052d2ae6 100644 --- a/integration/util.py +++ b/integration/util.py @@ -116,6 +116,7 @@ class _MagicTextProtocol(ProcessProtocol): self.exited.callback(None) def outReceived(self, data): + data = unicode(data, sys.stdout.encoding) sys.stdout.write(data) self._output.write(data) if not self.magic_seen.called and self._magic_text in self._output.getvalue(): @@ -123,6 +124,7 @@ class _MagicTextProtocol(ProcessProtocol): self.magic_seen.callback(self) def errReceived(self, data): + data = unicode(data, sys.stderr.encoding) sys.stdout.write(data)