X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=6d0cc3bdeab6dc920ae87d84c67aeaeecff58091;hb=76b6c2f71a485f0cc9b766e1a54b9f7330ccd907;hp=3c4ba62fb264292111d865f50b6021eb68371368;hpb=a01b452be2f3ec30264a06cb1e3da09a5fe124e9;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py index 3c4ba62f..6d0cc3bd 100644 --- a/tests/bindings/python/bt2/test_query_executor.py +++ b/tests/bindings/python/bt2/test_query_executor.py @@ -25,50 +25,34 @@ 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', - } + return {'null': None, 'bt2': 'BT2'} query_params = None params = { 'array': ['coucou', 23, None], - 'other_map': { - 'yes': 'yeah', - '19': 19, - 'minus 1.5': -1.5, - }, + 'other_map': {'yes': 'yeah', '19': 19, 'minus 1.5': -1.5}, 'null': None, } res = bt2.QueryExecutor().query(MySink, 'obj', params) self.assertEqual(query_params, params) - self.assertEqual(res, { - 'null': None, - 'bt2': 'BT2', - }) + self.assertEqual(res, {'null': None, 'bt2': 'BT2'}) del query_params 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 @@ -79,63 +63,58 @@ 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 query_log_level = None - res = bt2.QueryExecutor().query(MySink, 'obj', None, - bt2.LoggingLevel.INFO) + res = bt2.QueryExecutor().query(MySink, 'obj', None, bt2.LoggingLevel.INFO) self.assertEqual(query_log_level, bt2.LoggingLevel.INFO) del query_log_level 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): + with self.assertRaises(bt2._Error) as ctx: res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23]) - def test_query_invalid_object(self): - class MySink(bt2._UserSinkComponent): - def _consume(self): - pass + exc = ctx.exception + self.assertEqual(len(exc), 2) + cause = exc[0] + 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 _graph_is_configured(self): + def test_query_unknown_object(self): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): pass @classmethod - def _query(cls, query_exec, obj, params, log_level): - raise bt2.InvalidObject + def _user_query(cls, query_exec, obj, params, log_level): + raise bt2.UnknownObject - with self.assertRaises(bt2.InvalidObject): + with self.assertRaises(bt2.UnknownObject): res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23]) 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): @@ -143,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])