Changeset 0d093c4 in trunk

Timestamp:

2021-05-07T14:06:12Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

6df076d

Parents:

036a864

Message:

Test fails on Python 3, instead of spinning until timeout.

Location:

integration

Files:

• conftest.py (modified) (1 diff)
• test_servers_of_happiness.py (modified) (1 diff)
• util.py (modified) (2 diffs)

integration/conftest.py ¶

@@ -29 +29 @@
 import pytest_twisted
 
-from util import (
+from .util import (
     _CollectOutputProtocol,
     _MagicTextProtocol,

integration/test_servers_of_happiness.py ¶

@@ -4 +4 @@
 from twisted.internet.error import ProcessTerminated
 
-import util
+from . import util
 
 import pytest_twisted

integration/util.py ¶

@@ -117 +117 @@
 
     def outReceived(self, data):
+        data = unicode(data, sys.stdout.encoding)
         sys.stdout.write(data)
         self._output.write(data)
@@ -124 +125 @@
 
     def errReceived(self, data):
+        data = unicode(data, sys.stderr.encoding)
         sys.stdout.write(data)