X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=e4f1fa5b14e9a22c1a77f3d62ec12b063acdf703;hb=6a91742b3a25285222551341c8a134b4b2b5aba9;hp=9f57f30b32e47d7eec82c1171266cb2aa1c773f1;hpb=ce4923b0c7a2de36eba95725334d251e9aa08aad;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py index 9f57f30b..e4f1fa5b 100644 --- a/tests/bindings/python/bt2/test_query_executor.py +++ b/tests/bindings/python/bt2/test_query_executor.py @@ -25,14 +25,11 @@ import bt2 class QueryExecutorTestCase(unittest.TestCase): def test_query(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): nonlocal query_params query_params = params return {'null': None, 'bt2': 'BT2'} @@ -51,14 +48,11 @@ class QueryExecutorTestCase(unittest.TestCase): def test_query_params_none(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): nonlocal query_params query_params = params @@ -69,14 +63,11 @@ class QueryExecutorTestCase(unittest.TestCase): def test_query_logging_level(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): nonlocal query_log_level query_log_level = log_level @@ -87,37 +78,31 @@ class QueryExecutorTestCase(unittest.TestCase): def test_query_gen_error(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): raise ValueError - with self.assertRaises(bt2.Error) as ctx: + with self.assertRaises(bt2._Error) as ctx: 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') def test_query_invalid_object(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): raise bt2.InvalidObject with self.assertRaises(bt2.InvalidObject): @@ -125,14 +110,11 @@ class QueryExecutorTestCase(unittest.TestCase): def test_query_logging_level_invalid_type(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): pass with self.assertRaises(TypeError): @@ -140,69 +122,61 @@ class QueryExecutorTestCase(unittest.TestCase): def test_query_logging_level_invalid_value(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): + def _user_query(cls, query_exec, obj, params, log_level): pass 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 - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): - raise bt2.InvalidParams + def _user_query(cls, query_exec, obj, params, log_level): + 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 - - def _graph_is_configured(self): + def _user_consume(self): pass @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): + def _user_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 - - def _graph_is_configured(self): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): - raise bt2.TryAgain + def _user_query(cls, query_exec, obj, params, log_level): + 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])