X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=52af46649eb9afa3ab3ebe277de928695b2da1c4;hb=0ddaae90f2789927df222570c9df951aa15c6248;hp=0977430940f6afef0b07881cb104f634f77ea5d5;hpb=694c792bc8f078c02acde68a3390acafbb36b2f4;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py
index 09774309..52af4664 100644
--- a/tests/bindings/python/bt2/test_query_executor.py
+++ b/tests/bindings/python/bt2/test_query_executor.py
@@ -101,9 +101,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
 
         exc = ctx.exception
-        self.assertEqual(len(exc), 1)
+        self.assertEqual(len(exc), 2)
         cause = exc[0]
-        self.assertIsInstance(cause, bt2.error._ComponentClassErrorCause)
+        self.assertIsInstance(cause, bt2._ComponentClassErrorCause)
         self.assertIn('raise ValueError', cause.message)
         self.assertEqual(cause.component_class_type, bt2.ComponentClassType.SINK)
         self.assertEqual(cause.component_class_name, 'MySink')
@@ -153,7 +153,7 @@ class QueryExecutorTestCase(unittest.TestCase):
         with self.assertRaises(ValueError):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23], 12345)
 
-    def test_query_invalid_params(self):
+    def test_query_try_again(self):
         class MySink(bt2._UserSinkComponent):
             def _consume(self):
                 pass
@@ -163,12 +163,12 @@ class QueryExecutorTestCase(unittest.TestCase):
 
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
-                raise bt2.InvalidParams
+                raise bt2.TryAgain
 
-        with self.assertRaises(bt2.InvalidParams):
+        with self.assertRaises(bt2.TryAgain):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
 
-    def test_query_try_again(self):
+    def test_query_add_interrupter(self):
         class MySink(bt2._UserSinkComponent):
             def _consume(self):
                 pass
@@ -178,18 +178,22 @@ class QueryExecutorTestCase(unittest.TestCase):
 
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
-                raise bt2.TryAgain
-
-        with self.assertRaises(bt2.TryAgain):
-            res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
-
-    def test_cancel_no_query(self):
+                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 +203,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])