X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=3a0e27cb7b7eb1cfb34a08f0cd8feaacf15b4875;hb=57081273d1191fc79edc101af619fab96b72460d;hp=e4f1fa5b14e9a22c1a77f3d62ec12b063acdf703;hpb=6a91742b3a25285222551341c8a134b4b2b5aba9;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py index e4f1fa5b..3a0e27cb 100644 --- a/tests/bindings/python/bt2/test_query_executor.py +++ b/tests/bindings/python/bt2/test_query_executor.py @@ -16,10 +16,9 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -from bt2 import value import unittest -import copy import bt2 +import re class QueryExecutorTestCase(unittest.TestCase): @@ -29,7 +28,7 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): nonlocal query_params query_params = params return {'null': None, 'bt2': 'BT2'} @@ -41,7 +40,7 @@ class QueryExecutorTestCase(unittest.TestCase): 'null': None, } - res = bt2.QueryExecutor().query(MySink, 'obj', params) + res = bt2.QueryExecutor(MySink, 'obj', params).query() self.assertEqual(query_params, params) self.assertEqual(res, {'null': None, 'bt2': 'BT2'}) del query_params @@ -52,27 +51,110 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): nonlocal query_params query_params = params query_params = 23 - res = bt2.QueryExecutor().query(MySink, 'obj', None) - self.assertEqual(query_params, None) + res = bt2.QueryExecutor(MySink, 'obj', None).query() + self.assertIs(query_params, None) del query_params + def test_query_no_params(self): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): + pass + + @classmethod + def _user_query(cls, priv_query_exec, obj, params, method_obj): + nonlocal query_params + query_params = params + + query_params = 23 + res = bt2.QueryExecutor(MySink, 'obj').query() + self.assertIs(query_params, None) + del query_params + + def test_query_with_method_obj(self): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): + pass + + @classmethod + def _user_query(cls, priv_query_exec, obj, params, method_obj): + nonlocal query_method_obj + query_method_obj = method_obj + + query_method_obj = None + method_obj = object() + res = bt2.QueryExecutor(MySink, 'obj', method_obj=method_obj).query() + self.assertIs(query_method_obj, method_obj) + del query_method_obj + + def test_query_with_method_obj_del_ref(self): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): + pass + + @classmethod + def _user_query(cls, priv_query_exec, obj, params, method_obj): + nonlocal query_method_obj + query_method_obj = method_obj + + class Custom: + pass + + query_method_obj = None + method_obj = Custom() + method_obj.hola = 'hello' + query_exec = bt2.QueryExecutor(MySink, 'obj', method_obj=method_obj) + del method_obj + query_exec.query() + self.assertIsInstance(query_method_obj, Custom) + self.assertEqual(query_method_obj.hola, 'hello') + del query_method_obj + + def test_query_with_none_method_obj(self): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): + pass + + @classmethod + def _user_query(cls, priv_query_exec, obj, params, method_obj): + nonlocal query_method_obj + query_method_obj = method_obj + + query_method_obj = object() + res = bt2.QueryExecutor(MySink, 'obj').query() + self.assertIsNone(query_method_obj) + del query_method_obj + + def test_query_with_method_obj_non_python_comp_cls(self): + plugin = bt2.find_plugin('text', find_in_user_dir=False, find_in_sys_dir=False) + assert plugin is not None + cc = plugin.source_component_classes['dmesg'] + assert cc is not None + + with self.assertRaisesRegex( + ValueError, + re.escape(r'cannot pass a Python object to a non-Python component class'), + ): + bt2.QueryExecutor(cc, 'obj', method_obj=object()).query() + def test_query_logging_level(self): class MySink(bt2._UserSinkComponent): def _user_consume(self): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): nonlocal query_log_level - query_log_level = log_level + query_log_level = priv_query_exec.logging_level query_log_level = None - res = bt2.QueryExecutor().query(MySink, 'obj', None, bt2.LoggingLevel.INFO) + query_exec = bt2.QueryExecutor(MySink, 'obj', None) + query_exec.logging_level = bt2.LoggingLevel.INFO + query_exec.query() self.assertEqual(query_log_level, bt2.LoggingLevel.INFO) del query_log_level @@ -82,11 +164,11 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): raise ValueError with self.assertRaises(bt2._Error) as ctx: - res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23]) + res = bt2.QueryExecutor(MySink, 'obj', [17, 23]).query() exc = ctx.exception self.assertEqual(len(exc), 2) @@ -96,17 +178,17 @@ class QueryExecutorTestCase(unittest.TestCase): self.assertEqual(cause.component_class_type, bt2.ComponentClassType.SINK) self.assertEqual(cause.component_class_name, 'MySink') - def test_query_invalid_object(self): + def test_query_unknown_object(self): class MySink(bt2._UserSinkComponent): def _user_consume(self): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): - raise bt2.InvalidObject + def _user_query(cls, priv_query_exec, obj, params, method_obj): + raise bt2.UnknownObject - with self.assertRaises(bt2.InvalidObject): - res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23]) + with self.assertRaises(bt2.UnknownObject): + res = bt2.QueryExecutor(MySink, 'obj', [17, 23]).query() def test_query_logging_level_invalid_type(self): class MySink(bt2._UserSinkComponent): @@ -114,11 +196,13 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): pass + query_exec = bt2.QueryExecutor(MySink, 'obj', [17, 23]) + with self.assertRaises(TypeError): - res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23], 'yeah') + query_exec.logging_level = 'yeah' def test_query_logging_level_invalid_value(self): class MySink(bt2._UserSinkComponent): @@ -126,11 +210,13 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): pass + query_exec = bt2.QueryExecutor(MySink, 'obj', [17, 23]) + with self.assertRaises(ValueError): - res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23], 12345) + query_exec.logging_level = 12345 def test_query_try_again(self): class MySink(bt2._UserSinkComponent): @@ -138,11 +224,11 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): raise bt2.TryAgain with self.assertRaises(bt2.TryAgain): - res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23]) + res = bt2.QueryExecutor(MySink, 'obj', [17, 23]).query() def test_query_add_interrupter(self): class MySink(bt2._UserSinkComponent): @@ -150,7 +236,7 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): nonlocal interrupter2 test_self.assertFalse(query_exec.is_interrupted) interrupter2.set() @@ -161,10 +247,10 @@ class QueryExecutorTestCase(unittest.TestCase): interrupter1 = bt2.Interrupter() interrupter2 = bt2.Interrupter() test_self = self - query_exec = bt2.QueryExecutor() + query_exec = bt2.QueryExecutor(MySink, 'obj', [17, 23]) query_exec.add_interrupter(interrupter1) query_exec.add_interrupter(interrupter2) - query_exec.query(MySink, 'obj', [17, 23]) + query_exec.query() def test_query_interrupt(self): class MySink(bt2._UserSinkComponent): @@ -172,11 +258,31 @@ class QueryExecutorTestCase(unittest.TestCase): pass @classmethod - def _user_query(cls, query_exec, obj, params, log_level): + def _user_query(cls, priv_query_exec, obj, params, method_obj): 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.query(MySink, 'obj', [17, 23]) + query_exec = bt2.QueryExecutor(MySink, 'obj', [17, 23]) + query_exec.query() + + def test_query_priv_executor_invalid_after(self): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): + pass + + @classmethod + def _user_query(cls, priv_query_exec, obj, params, method_obj): + nonlocal test_priv_query_exec + test_priv_query_exec = priv_query_exec + + test_priv_query_exec = None + query_exec = bt2.QueryExecutor(MySink, 'obj', [17, 23]) + query_exec.query() + assert test_priv_query_exec is not None + + with self.assertRaises(RuntimeError): + test_priv_query_exec.logging_level + + del test_priv_query_exec