10587: Removed use of multiprocessing module on --version tests. Added a common stder...
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 7 Dec 2016 18:29:23 +0000 (15:29 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 7 Dec 2016 18:29:23 +0000 (15:29 -0300)
sdk/python/tests/arvados_testutil.py
sdk/python/tests/test_arv_copy.py
sdk/python/tests/test_arv_keepdocker.py
sdk/python/tests/test_arv_ls.py
sdk/python/tests/test_arv_put.py
sdk/python/tests/test_arv_run.py
sdk/python/tests/test_arv_ws.py
services/nodemanager/tests/test_arguments.py
services/nodemanager/tests/testutil.py

index 71c9b178e7525808508babf86a383a37b4ab4ba6..dae3dd3b7b19c923ff53381e9f3ebef8c5abae49 100644 (file)
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import arvados
+import contextlib
 import errno
 import hashlib
 import httplib
@@ -11,6 +12,7 @@ import os
 import pycurl
 import Queue
 import shutil
+import sys
 import tempfile
 import unittest
 
@@ -50,6 +52,17 @@ def mock_api_responses(api_client, body, codes, headers={}):
 def str_keep_locator(s):
     return '{}+{}'.format(hashlib.md5(s).hexdigest(), len(s))
 
+@contextlib.contextmanager
+def redirected_streams(stdout=None, stderr=None):
+    orig_stdout, sys.stdout = sys.stdout, stdout or sys.stdout
+    orig_stderr, sys.stderr = sys.stderr, stderr or sys.stderr
+    try:
+        yield
+    finally:
+        sys.stdout = orig_stdout
+        sys.stderr = orig_stderr
+
+
 class FakeCurl:
     @classmethod
     def make(cls, code, body='', headers={}):
index 4be212c73b28dd36c75d23c2136c6ed74e9ff4e3..e291ee05f2ed07b0635cc6c8b5374b0fdecb11ba 100644 (file)
@@ -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.arv_copy as arv_copy
+import arvados_testutil as tutil
 
 class ArvCopyTestCase(unittest.TestCase):
     def run_copy(self, args):
         sys.argv = ['arv-copy'] + args
         return arv_copy.main()
 
-    def run_copy_process(self, args):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper():
-                sys.argv = ['arv-copy'] + args
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                arv_copy.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_copy(['-x=unknown'])
 
     def test_version_argument(self):
-        exitcode, out, err = self.run_copy_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_copy(['--version'])
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
index 27081afc1ddac46ec1a90774896ec72965836ae5..bb94db560f631333a9945f8c3388ebc66a69266c 100644 (file)
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import multiprocessing
+import io
 import os
 import sys
 import tempfile
 import unittest
 
 import arvados.commands.keepdocker as arv_keepdocker
+import arvados_testutil as tutil
 
 
 class ArvKeepdockerTestCase(unittest.TestCase):
@@ -15,32 +16,15 @@ class ArvKeepdockerTestCase(unittest.TestCase):
         sys.argv = ['arv-keepdocker'] + args
         return arv_keepdocker.main()
 
-    def run_arv_keepdocker_process(self, args):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper():
-                sys.argv = ['arv-keepdocker'] + args
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                arv_keepdocker.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_keepdocker(['-x=unknown'])
 
     def test_version_argument(self):
-        exitcode, out, err = self.run_arv_keepdocker_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_keepdocker(['--version'])
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
index ed03c124f4030b7bda63802d0dc14a972e796175..5064f07d722ee77efc0c8a4f733eaf86d02b8b39 100644 (file)
@@ -7,13 +7,12 @@ import random
 import sys
 import mock
 import tempfile
-import multiprocessing
 
 import arvados.errors as arv_error
 import arvados.commands.ls as arv_ls
 import run_test_server
 
-from arvados_testutil import str_keep_locator
+from arvados_testutil import str_keep_locator, redirected_streams
 
 class ArvLsTestCase(run_test_server.TestCaseWithServers):
     FAKE_UUID = 'zzzzz-4zz18-12345abcde12345'
@@ -41,25 +40,6 @@ class ArvLsTestCase(run_test_server.TestCaseWithServers):
         self.stderr = io.BytesIO()
         return arv_ls.main(args, self.stdout, self.stderr, api_client)
 
-    def run_ls_process(self, args=[], api_client=None):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper(*args, **kwargs):
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                arv_ls.main(*args, **kwargs)
-            return wrapper
-        p = multiprocessing.Process(target=wrap(),
-                                    args=(args, sys.stdout, sys.stderr, api_client))
-        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_plain_listing(self):
         collection, api_client = self.mock_api_for_manifest(
             ['. {} 0:3:one.txt 3:4:two.txt'.format(self.random_blocks(5, 2)),
@@ -102,9 +82,10 @@ class ArvLsTestCase(run_test_server.TestCaseWithServers):
         self.assertNotEqual('', self.stderr.getvalue())
 
     def test_version_argument(self):
-        _, api_client = self.mock_api_for_manifest([''])
-        exitcode, out, err = self.run_ls_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 redirected_streams(stdout=out, stderr=err):
+            with self.assertRaises(SystemExit):
+                self.run_ls(['--version'], None)
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
index 76317b615a778dc48d8225c9e2c17f7dcf499e04..f35e4c725c1ebfb74062b44b4c4c4d5477684f9a 100644 (file)
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import apiclient
+import io
 import mock
 import os
 import pwd
@@ -16,7 +17,6 @@ import yaml
 import threading
 import hashlib
 import random
-import multiprocessing
 
 from cStringIO import StringIO
 
@@ -397,24 +397,6 @@ class ArvadosPutTest(run_test_server.TestCaseWithServers, ArvadosBaseTestCase):
                                         '098f6bcd4621d373cade4e832627b4f6')),
             "did not find file stream in Keep store")
 
-    def run_main_process(self, args):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper(*args, **kwargs):
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                arv_put.main(*args, **kwargs)
-            return wrapper
-        p = multiprocessing.Process(target=wrap(), args=(args, sys.stdout, sys.stderr))
-        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 setUp(self):
         super(ArvadosPutTest, self).setUp()
         run_test_server.authorize_with('active')
@@ -428,11 +410,13 @@ class ArvadosPutTest(run_test_server.TestCaseWithServers, ArvadosBaseTestCase):
         super(ArvadosPutTest, self).tearDown()
 
     def test_version_argument(self):
-        exitcode, out, err = self.run_main_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.call_main_with_args(['--version'])
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
 
     def test_simple_file_put(self):
         self.call_main_on_test_file()
index 7afe52bce81670ad7a9e2f80912914450248d133..3d04d272286240cec2ec2d9103a10d6dbaddbda9 100644 (file)
@@ -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]+")
index 17706c19b655c66eb063cc046691bcd86143d143..2a85e04e87c06067bd7d83773295cf049f747852 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import multiprocessing
+import io
 import os
 import sys
 import tempfile
@@ -8,36 +8,21 @@ import unittest
 
 import arvados.errors as arv_error
 import arvados.commands.ws as arv_ws
+import arvados_testutil as tutil
 
 class ArvWsTestCase(unittest.TestCase):
     def run_ws(self, args):
         return arv_ws.main(args)
 
-    def run_ws_process(self, args=[], api_client=None):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper(*args, **kwargs):
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                arv_ws.main(*args, **kwargs)
-            return wrapper
-        p = multiprocessing.Process(target=wrap(), args=(args,))
-        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_ws(['-x=unknown'])
 
     def test_version_argument(self):
-        exitcode, out, err = self.run_ws_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_ws(['--version'])
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
index e4749ce01caee552e310aa471077d954e1971235..f98309aef4b41238cda05e5c459d3a9222afd593 100644 (file)
@@ -1,42 +1,27 @@
 #!/usr/bin/env python
 
-import multiprocessing
+import io
 import os
 import sys
 import tempfile
 import unittest
 
 import arvnodeman.launcher as nodeman
+from . import testutil
 
 class ArvNodemArgumentsTestCase(unittest.TestCase):
     def run_nodeman(self, args):
         return nodeman.main(args)
 
-    def run_nodeman_process(self, args=[]):
-        _, stdout_path = tempfile.mkstemp()
-        _, stderr_path = tempfile.mkstemp()
-        def wrap():
-            def wrapper(*args, **kwargs):
-                sys.stdout = open(stdout_path, 'w')
-                sys.stderr = open(stderr_path, 'w')
-                nodeman.main(*args, **kwargs)
-            return wrapper
-        p = multiprocessing.Process(target=wrap(), args=(args,))
-        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_nodeman(['-x=unknown'])
 
     def test_version_argument(self):
-        exitcode, out, err = self.run_nodeman_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 testutil.redirected_streams(stdout=out, stderr=err):
+            with self.assertRaises(SystemExit):
+                self.run_nodeman(['--version'])
+        self.assertEqual(out.getvalue(), '')
+        self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
index 1b6aab3cafed16cfc0960d1a39a32d669fe53ffb..15337c4120173b6a7f2ca6b21f0924bd571f2326 100644 (file)
@@ -2,13 +2,15 @@
 
 from __future__ import absolute_import, print_function
 
+import contextlib
 import datetime
+import mock
+import pykka
+import sys
 import threading
 import time
 
 import libcloud.common.types as cloud_types
-import mock
-import pykka
 
 from . import pykka_timeout
 
@@ -55,6 +57,17 @@ def cloud_node_fqdn(node):
 def ip_address_mock(last_octet):
     return '10.20.30.{}'.format(last_octet)
 
+@contextlib.contextmanager
+def redirected_streams(stdout=None, stderr=None):
+    orig_stdout, sys.stdout = sys.stdout, stdout or sys.stdout
+    orig_stderr, sys.stderr = sys.stderr, stderr or sys.stderr
+    try:
+        yield
+    finally:
+        sys.stdout = orig_stdout
+        sys.stderr = orig_stderr
+
+
 class MockShutdownTimer(object):
     def _set_state(self, is_open, next_opening):
         self.window_open = lambda: is_open