diff --git a/IPython/parallel/tests/test_client.py b/IPython/parallel/tests/test_client.py index 440706b..a35c1fb 100644 --- a/IPython/parallel/tests/test_client.py +++ b/IPython/parallel/tests/test_client.py @@ -228,6 +228,8 @@ class TestClient(ClusterTestCase): v = self.client.load_balanced_view() ar = v.apply_async(f) r1 = ar.get(1) + # give the Hub a chance to notice: + time.sleep(0.5) ahr = self.client.resubmit(ar.msg_ids) r2 = ahr.get(1) self.assertFalse(r1 == r2) diff --git a/IPython/parallel/tests/test_lbview.py b/IPython/parallel/tests/test_lbview.py index b3646da..68d7ce2 100644 --- a/IPython/parallel/tests/test_lbview.py +++ b/IPython/parallel/tests/test_lbview.py @@ -59,6 +59,7 @@ class TestLoadBalancedView(ClusterTestCase): def test_abort(self): view = self.view ar = self.client[:].apply_async(time.sleep, .5) + ar = self.client[:].apply_async(time.sleep, .5) ar2 = view.apply_async(lambda : 2) ar3 = view.apply_async(lambda : 3) view.abort(ar2) diff --git a/IPython/parallel/tests/test_view.py b/IPython/parallel/tests/test_view.py index 94dd5fc..347a5ff 100644 --- a/IPython/parallel/tests/test_view.py +++ b/IPython/parallel/tests/test_view.py @@ -319,7 +319,7 @@ class TestView(ClusterTestCase): ip.magic_px('print a') sys.stdout = savestdout buf = sio.getvalue() - self.assertTrue('[stdout:%i]'%v.targets in buf) + self.assertTrue('[stdout:' in buf, buf) self.assertTrue(buf.rstrip().endswith('10')) self.assertRaisesRemote(ZeroDivisionError, ip.magic_px, '1/0')