Fix connection plugin tests.

connection_plugins/qubes.py

@@ -450,7 +450,7 @@ class Connection(ConnectionBase):
         super(Connection, self).fetch_file(in_path, out_path)
         display.vvvv("FETCH %s to %s" % (in_path, out_path), host=self._play_context.remote_addr)
         in_path = _prefix_login_path(in_path)
-        out_file = open(out_path, "wb")
+        with open(out_path, "wb") as out_file:
             try:
                 payload = 'fetch(%r, %r)\n' % (in_path, BUFSIZE)
                 self._transport.stdin.write(payload.encode("utf-8"))

connection_plugins/test_qubes.py

@@ -1,81 +1,103 @@
 import sys, os ; sys.path.append(os.path.dirname(__file__))
 
-import StringIO
+import contextlib
-import qubes
+try:
+    from StringIO import StringIO
+    BytesIO = StringIO
+except ImportError:
+    from io import StringIO, BytesIO
 import unittest
 import tempfile
 
+import qubes
 
+
+
+if sys.version_info.major == 3:
     cases = [
-    (['true'], '', 'Y\n0\n0\n0\n'),
+        (['true'], '', b'Y\n0\n0\n0\n'),
-    (['false'], '', 'Y\n1\n0\n0\n'),
+        (['false'], '', b'Y\n1\n0\n0\n'),
-    (['sh', '-c', 'echo yes'], '', 'Y\n0\n4\nyes\n0\n'),
+        (['sh', '-c', 'echo yes'], '', b'Y\n0\n4\nyes\n0\n'),
-    (['sh', '-c', 'echo yes >&2'], '', 'Y\n0\n0\n4\nyes\n'),
+        (['sh', '-c', 'echo yes >&2'], '', b'Y\n0\n0\n4\nyes\n'),
     ]
     cases_with_harness = [
         (['true'], '', 0, '', ''),
         (['false'], '', 1, '', ''),
-    (['sh', '-c', 'echo yes'], '', 0, 'yes\n', ''),
+        (['sh', '-c', 'echo yes'], '', 0, b'yes\n', ''),
-    (['sh', '-c', 'echo yes >&2'], '', 0, '', 'yes\n'),
+        (['sh', '-c', 'echo yes >&2'], '', 0, '', b'yes\n'),
     ]
+else:
+    cases = []
+    cases_with_harness = []
 
 
 class MockPlayContext(object):
     shell = 'sh'
+    executable = 'sh'
     become = False
     become_method = 'sudo'
     remote_addr = '127.0.0.7'
 
 
+@contextlib.contextmanager
 def local_connection():
     c = qubes.Connection(
         MockPlayContext(), None,
         transport_cmd=['sh', '-c', '"$@"']
     )
     c._options = {"management_proxy": None}
-    return c
+    try:
+        yield c
+    finally:
+        c.close()
 
 
 class TestBasicThings(unittest.TestCase):
 
     def test_popen(self):
         for cmd, in_, out in cases:
-            outf = StringIO.StringIO()
+            outf = BytesIO()
             qubes.popen(cmd, in_, outf=outf)
-            self.assertMultiLineEqual(
+            self.assertEqual(
                 outf.getvalue(),
                 out
             )
 
     def test_exec_command_with_harness(self):
         for cmd, in_, ret, out, err in cases_with_harness:
-            c = local_connection()
+            with local_connection() as c:
                 retcode, stdout, stderr = c.exec_command(cmd)
                 self.assertEqual(ret, retcode)
-            self.assertMultiLineEqual(out, stdout)
+                self.assertEqual(out, stdout)
-            self.assertMultiLineEqual(err, stderr)
+                self.assertEqual(err, stderr)
-            c.close()
             self.assertEqual(c._transport, None)
 
     def test_fetch_file_with_harness(self):
+        if sys.version_info.major == 2:
             in_text = "abcd"
+        else:
+            in_text = b"abcd"
         with tempfile.NamedTemporaryFile() as x:
             x.write(in_text)
             x.flush()
             with tempfile.NamedTemporaryFile() as y:
-                c = local_connection()
+                with local_connection() as c:
                     c.fetch_file(in_path=x.name, out_path=y.name)
+                    y.seek(0)
                     out_text = y.read()
         self.assertEqual(in_text, out_text)
 
-
     def test_put_file_with_harness(self):
+        if sys.version_info.major == 2:
             in_text = "abcd"
+        else:
+            in_text = b"abcd"
         with tempfile.NamedTemporaryFile() as x:
             x.write(in_text)
             x.flush()
             with tempfile.NamedTemporaryFile() as y:
-                c = local_connection()
+                with local_connection() as c:
                     c.put_file(in_path=x.name, out_path=y.name)
+                    y.seek(0)
                     out_text = y.read()
         self.assertEqual(in_text, out_text)