Merge pull request ipython#1565 from minrk/abort

Fix bug when calling AsyncResult.abort().

IPython/parallel/client/asyncresult.py

@@ -195,7 +195,7 @@ def __dict__(self):
     def abort(self):
         """abort my tasks."""
         assert not self.ready(), "Can't abort, I am already done!"
-        return self.client.abort(self.msg_ids, targets=self._targets, block=True)
+        return self._client.abort(self.msg_ids, targets=self._targets, block=True)
 
     @property
     def sent(self):

IPython/parallel/tests/test_asyncresult.py

@@ -19,6 +19,7 @@
 
 from IPython.parallel.error import TimeoutError
 
+from IPython.parallel import error
 from IPython.parallel.tests import add_engines
 from .clienttest import ClusterTestCase
 
@@ -32,7 +33,8 @@ def wait(n):
 
 class AsyncResultTest(ClusterTestCase):
 
-    def test_single_result(self):
+    def test_single_result_view(self):
+        """various one-target views get the right value for single_result"""
         eid = self.client.ids[-1]
         ar = self.client[eid].apply_async(lambda : 42)
         self.assertEquals(ar.get(), 42)
@@ -111,5 +113,13 @@ def test_single_result(self):
         self.assertTrue(isinstance(ar['engine_id'], int))
         self.assertTrue(isinstance(ar.engine_id, int))
         self.assertEquals(ar.engine_id, ar['engine_id'])
+
+    def test_abort(self):
+        e = self.client[-1]
+        ar = e.execute('import time; time.sleep(1)', block=False)
+        ar2 = e.apply_async(lambda : 2)
+        ar2.abort()
+        self.assertRaises(error.TaskAborted, ar2.get)
+        ar.get()