[stream-refactor] Py3.x test fixes

Author: dw

tests/data/stubs/stub-su.py

@@ -9,9 +9,9 @@
 # #363: old input loop would fail to spot auth failure because of scheduling
 # vs. su calling write() twice.
 if 'DO_SLOW_AUTH_FAILURE' in os.environ:
-    os.write(2, 'su: ')
+    os.write(2, u'su: '.encode())
     time.sleep(0.5)
-    os.write(2, 'incorrect password\n')
+    os.write(2, u'incorrect password\n'.encode())
     os._exit(1)
 
 

tests/first_stage_test.py

@@ -41,7 +41,7 @@ def test_valid_syntax(self):
             stdout, stderr = proc.communicate()
             self.assertEquals(0, proc.returncode)
             self.assertEquals(stdout,
-                mitogen.parent.BootstrapProtocol.EC0_MARKER+'\n')
+                mitogen.parent.BootstrapProtocol.EC0_MARKER+b('\n'))
             self.assertIn(b("Error -5 while decompressing data"), stderr)
         finally:
             fp.close()

tests/parent_test.py

@@ -14,6 +14,11 @@
 
 import mitogen.parent
 
+try:
+    file
+except NameError:
+    from io import FileIO as file
+
 
 def wait_for_child(pid, timeout=1.0):
     deadline = time.time() + timeout
@@ -226,7 +231,8 @@ def test_dev_tty_open_succeeds(self):
             ])
             deadline = time.time() + 5.0
             mitogen.core.set_block(proc.stdin.fileno())
-            self.assertEquals(mitogen.core.b('hi\n'), proc.stdin.read())
+            # read(3) below due to https://bugs.python.org/issue37696
+            self.assertEquals(mitogen.core.b('hi\n'), proc.stdin.read(3))
             waited_pid, status = os.waitpid(proc.pid, 0)
             self.assertEquals(proc.pid, waited_pid)
             self.assertEquals(0, status)