From 6b4e0470177bfa178826e2f39d408d43e498f139 Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Tue, 26 Jun 2018 15:41:48 +0100
Subject: [PATCH] tests: 3.x parent_test fixes.

---
 mitogen/parent.py    |  2 +-
 tests/parent_test.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mitogen/parent.py b/mitogen/parent.py
index 9bc069bc..e2c22110 100644
--- a/mitogen/parent.py
+++ b/mitogen/parent.py
@@ -340,7 +340,7 @@ def iter_read(fds, deadline=None):
     if not poller.readers:
         raise mitogen.core.StreamError(
             'EOF on stream; last 300 bytes received: %r' %
-            (b('').join(bits)[-300:],)
+            (b('').join(bits)[-300:].decode('latin1'),)
         )
     raise mitogen.core.TimeoutError('read timed out')
 
diff --git a/tests/parent_test.py b/tests/parent_test.py
index c4dafb62..31c168e9 100644
--- a/tests/parent_test.py
+++ b/tests/parent_test.py
@@ -78,7 +78,7 @@ class StreamErrorTest(testlib.RouterMixin, testlib.TestCase):
                 connect_timeout=3,
             )
         )
-        prefix = 'Child start failed: [Errno 2] No such file or directory.'
+        prefix = 'Child start failed: [Errno 2] No such file or directory'
         self.assertTrue(e.args[0].startswith(prefix))
 
     def test_via_enoent(self):
@@ -90,7 +90,7 @@ class StreamErrorTest(testlib.RouterMixin, testlib.TestCase):
                 connect_timeout=3,
             )
         )
-        s = 'Child start failed: [Errno 2] No such file or directory.'
+        s = 'Child start failed: [Errno 2] No such file or directory'
         self.assertTrue(s in e.args[0])
 
 
@@ -123,12 +123,12 @@ class TtyCreateChildTest(unittest2.TestCase):
             ])
             deadline = time.time() + 5.0
             for line in mitogen.parent.iter_read([fd], deadline):
-                self.assertEquals('hi\n', line)
+                self.assertEquals(mitogen.core.b('hi\n'), line)
                 break
             waited_pid, status = os.waitpid(pid, 0)
             self.assertEquals(pid, waited_pid)
             self.assertEquals(0, status)
-            self.assertEquals('', tf.read())
+            self.assertEquals(mitogen.core.b(''), tf.read())
         finally:
             tf.close()
 
@@ -194,7 +194,7 @@ class WriteAllTest(unittest2.TestCase):
         mitogen.core.set_nonblock(proc.stdin.fileno())
         return proc
 
-    ten_ms_chunk = ('x' * 65535)
+    ten_ms_chunk = (mitogen.core.b('x') * 65535)
 
     def test_no_deadline(self):
         proc = self.make_proc()