From 746e6e6b19cd701a25494b6242ea900102f96927 2011-04-10 03:44:38
From: MinRK <benjaminrk@gmail.com>
Date: 2011-04-10 03:44:38
Subject: [PATCH] fix out of sync parallel tests

recent changes in view.pull and queue_status were not matched in tests.
---

diff --git a/IPython/parallel/tests/test_client.py b/IPython/parallel/tests/test_client.py
index b2d1311..e3069ed 100644
--- a/IPython/parallel/tests/test_client.py
+++ b/IPython/parallel/tests/test_client.py
@@ -126,7 +126,8 @@ class TestClient(ClusterTestCase):
         self.assertEquals(sorted(qs.keys()), ['completed', 'queue', 'tasks'])
         allqs = self.client.queue_status()
         self.assertTrue(isinstance(allqs, dict))
-        self.assertEquals(sorted(allqs.keys()), self.client.ids)
+        self.assertEquals(sorted(allqs.keys()), sorted(self.client.ids + ['unassigned']))
+        unassigned = allqs.pop('unassigned')
         for eid,qs in allqs.items():
             self.assertTrue(isinstance(qs, dict))
             self.assertEquals(sorted(qs.keys()), ['completed', 'queue', 'tasks'])
diff --git a/IPython/parallel/tests/test_view.py b/IPython/parallel/tests/test_view.py
index 2714909..629d9ac 100644
--- a/IPython/parallel/tests/test_view.py
+++ b/IPython/parallel/tests/test_view.py
@@ -74,7 +74,7 @@ class TestView(ClusterTestCase):
         r = ar.get()
         self.assertEquals(r, nengines*[data])
         self.client[:].push(dict(a=10,b=20))
-        r = self.client[:].pull(('a','b'))
+        r = self.client[:].pull(('a','b'), block=True)
         self.assertEquals(r, nengines*[[10,20]])
     
     def test_push_pull_function(self):
@@ -83,10 +83,11 @@ class TestView(ClusterTestCase):
             return 2.0*x
         
         t = self.client.ids[-1]
-        self.client[t].block=True
-        push = self.client[t].push
-        pull = self.client[t].pull
-        execute = self.client[t].execute
+        v = self.client[t]
+        v.block=True
+        push = v.push
+        pull = v.pull
+        execute = v.execute
         push({'testf':testf})
         r = pull('testf')
         self.assertEqual(r(1.0), testf(1.0))