Merge pull request #56 from sideshowdave7/python3-test-hang

mock manager call

2 files changed, 2 insertions, 13 deletions

diff --git a/eventmq/tests/test_jobmanager.py b/eventmq/tests/test_jobmanager.py
index 566c583..777e69c 100644
--- a/eventmq/tests/test_jobmanager.py
+++ b/eventmq/tests/test_jobmanager.py
@@ -44,7 +44,7 @@ class TestCase(unittest.TestCase):
 
         sndmsg_mock.assert_called_with(jm.outgoing, 'READY')
 
-    @mock.patch('multiprocessing.pool.Pool.close')
+    @mock.patch('multiprocessing.Manager')
     @mock.patch('eventmq.jobmanager.JobManager.process_message')
     @mock.patch('eventmq.jobmanager.Sender.recv_multipart')
     @mock.patch('eventmq.jobmanager.Poller.poll')
@@ -56,6 +56,7 @@ class TestCase(unittest.TestCase):
         maybe_send_hb_mock.return_value = False
         poll_mock.return_value = {jm.outgoing: jobmanager.POLLIN}
         sender_mock.return_value = [1, 2, 3]
+        pool_close_mock.return_value = None
 
         jm._start_event_loop()
 
diff --git a/eventmq/tests/test_worker.py b/eventmq/tests/test_worker.py
index 66808fd..5e72f39 100644
--- a/eventmq/tests/test_worker.py
+++ b/eventmq/tests/test_worker.py
@@ -14,24 +14,13 @@
 # along with eventmq.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from multiprocessing import Pool
 import time
 
-from nose import with_setup
-
 from .. import worker
 
 ADDR = 'inproc://pour_the_rice_in_the_thing'
 
 
-def setup_func():
-    global pool
-    global out
-    pool = Pool()
-    out = pool.map(job, range(1))
-
-
-@with_setup(setup_func)
 def test_run_with_timeout():
     payload = {
         'path': 'eventmq.tests.test_worker',
@@ -44,7 +33,6 @@ def test_run_with_timeout():
     assert msgid
 
 
-@with_setup(setup_func)
 def test_run_setup():
     setup_callable = 'pre_hook'
     setup_path = 'eventmq.tests.test_worker'