X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=bc20a719b3dca0000ee9a1fa123ed51041ddc0ef;hp=0977430940f6afef0b07881cb104f634f77ea5d5;hb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;hpb=1e92035335352f8a67cbc3de28a0ad44b7ee02a1

diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py
index 09774309..bc20a719 100644
--- a/tests/bindings/python/bt2/test_query_executor.py
+++ b/tests/bindings/python/bt2/test_query_executor.py
@@ -183,13 +183,32 @@ class QueryExecutorTestCase(unittest.TestCase):
         with self.assertRaises(bt2.TryAgain):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
 
-    def test_cancel_no_query(self):
+    def test_query_add_interrupter(self):
+        class MySink(bt2._UserSinkComponent):
+            def _consume(self):
+                pass
+
+            def _graph_is_configured(self):
+                pass
+
+            @classmethod
+            def _query(cls, query_exec, obj, params, log_level):
+                nonlocal interrupter2
+                test_self.assertFalse(query_exec.is_interrupted)
+                interrupter2.set()
+                test_self.assertTrue(query_exec.is_interrupted)
+                interrupter2.reset()
+                test_self.assertFalse(query_exec.is_interrupted)
+
+        interrupter1 = bt2.Interrupter()
+        interrupter2 = bt2.Interrupter()
+        test_self = self
         query_exec = bt2.QueryExecutor()
-        self.assertFalse(query_exec.is_canceled)
-        query_exec.cancel()
-        self.assertTrue(query_exec.is_canceled)
+        query_exec.add_interrupter(interrupter1)
+        query_exec.add_interrupter(interrupter2)
+        query_exec.query(MySink, 'obj', [17, 23])
 
-    def test_query_canceled(self):
+    def test_query_interrupt(self):
         class MySink(bt2._UserSinkComponent):
             def _consume(self):
                 pass
@@ -199,10 +218,10 @@ class QueryExecutorTestCase(unittest.TestCase):
 
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
-                raise bt2.TryAgain
+                test_self.assertFalse(query_exec.is_interrupted)
+                query_exec.interrupt()
+                test_self.assertTrue(query_exec.is_interrupted)
 
+        test_self = self
         query_exec = bt2.QueryExecutor()
-        query_exec.cancel()
-
-        with self.assertRaises(bt2.Canceled):
-            res = query_exec.query(MySink, 'obj', [17, 23])
+        query_exec.query(MySink, 'obj', [17, 23])