Merge branch '11070-ws-listener-problem'

[arvados.git] / sdk / python / tests / test_arv_run.py

diff --git a/sdk/python/tests/test_arv_run.py b/sdk/python/tests/test_arv_run.py
index 7afe52bce81670ad7a9e2f80912914450248d133..3d04d272286240cec2ec2d9103a10d6dbaddbda9 100644 (file)
--- a/sdk/python/tests/test_arv_run.py
+++ b/sdk/python/tests/test_arv_run.py
@@ -1,45 +1,29 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import multiprocessing
+import io
 import os
 import sys
 import tempfile
 import unittest
 
 import arvados.commands.run as arv_run
+import arvados_testutil as tutil
 
 class ArvRunTestCase(unittest.TestCase):
     def run_arv_run(self, args):
         sys.argv = ['arv-run'] + args
         return arv_run.main()
 
-    def run_arv_run_process(self, args):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper():
-                sys.argv = ['arv-run'] + args
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                arv_run.main()
-            return wrapper
-        p = multiprocessing.Process(target=wrap())
-        p.start()
-        p.join()
-        out = open(stdout_path, 'r').read()
-        err = open(stderr_path, 'r').read()
-        os.unlink(stdout_path)
-        os.unlink(stderr_path)
-        return p.exitcode, out, err
-
     def test_unsupported_arg(self):
         with self.assertRaises(SystemExit):
             self.run_arv_run(['-x=unknown'])
 
     def test_version_argument(self):
-        exitcode, out, err = self.run_arv_run_process(['--version'])
-        self.assertEqual(0, exitcode)
-        self.assertEqual('', out)
-        self.assertNotEqual('', err)
-        self.assertRegexpMatches(err, "[0-9]+\.[0-9]+\.[0-9]+")
+        err = io.BytesIO()
+        out = io.BytesIO()
+        with tutil.redirected_streams(stdout=out, stderr=err):
+            with self.assertRaises(SystemExit):
+                self.run_arv_run(['--version'])
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")