X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=30e5a2c9d6699c94881463f27f8f9fe37132f06a;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=e1b298861f4dc661c3633acf9366e18da8a904e7;hpb=c4239792c6758f579fb9482ddccf336f1bbf26c4;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py
index e1b29886..30e5a2c9 100644
--- a/tests/bindings/python/bt2/test_query_executor.py
+++ b/tests/bindings/python/bt2/test_query_executor.py
@@ -1,10 +1,27 @@
+#
+# Copyright (C) 2019 EfficiOS Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; only version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
 from bt2 import value
 import unittest
 import copy
 import bt2
 
 
-@unittest.skip("this is broken")
 class QueryExecutorTestCase(unittest.TestCase):
     def test_query(self):
         class MySink(bt2._UserSinkComponent):
@@ -12,7 +29,7 @@ class QueryExecutorTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
+            def _query(cls, query_exec, obj, params, log_level):
                 nonlocal query_params
                 query_params = params
                 return {
@@ -45,7 +62,7 @@ class QueryExecutorTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
+            def _query(cls, query_exec, obj, params, log_level):
                 nonlocal query_params
                 query_params = params
 
@@ -54,13 +71,29 @@ class QueryExecutorTestCase(unittest.TestCase):
         self.assertEqual(query_params, None)
         del query_params
 
+    def test_query_logging_level(self):
+        class MySink(bt2._UserSinkComponent):
+            def _consume(self):
+                pass
+
+            @classmethod
+            def _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)
+        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
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
+            def _query(cls, query_exec, obj, params, log_level):
                 raise ValueError
 
         with self.assertRaises(bt2.Error):
@@ -72,22 +105,46 @@ class QueryExecutorTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
-                raise bt2.InvalidQueryObject
+            def _query(cls, query_exec, obj, params, log_level):
+                raise bt2.InvalidObject
 
-        with self.assertRaises(bt2.InvalidQueryObject):
+        with self.assertRaises(bt2.InvalidObject):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
 
+    def test_query_logging_level_invalid_type(self):
+        class MySink(bt2._UserSinkComponent):
+            def _consume(self):
+                pass
+
+            @classmethod
+            def _query(cls, query_exec, obj, params, log_level):
+                pass
+
+        with self.assertRaises(TypeError):
+            res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23], 'yeah')
+
+    def test_query_logging_level_invalid_value(self):
+        class MySink(bt2._UserSinkComponent):
+            def _consume(self):
+                pass
+
+            @classmethod
+            def _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):
         class MySink(bt2._UserSinkComponent):
             def _consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
-                raise bt2.InvalidQueryParams
+            def _query(cls, query_exec, obj, params, log_level):
+                raise bt2.InvalidParams
 
-        with self.assertRaises(bt2.InvalidQueryParams):
+        with self.assertRaises(bt2.InvalidParams):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
 
     def test_query_try_again(self):
@@ -96,7 +153,7 @@ class QueryExecutorTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
+            def _query(cls, query_exec, obj, params, log_level):
                 raise bt2.TryAgain
 
         with self.assertRaises(bt2.TryAgain):
@@ -114,19 +171,11 @@ class QueryExecutorTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params):
+            def _query(cls, query_exec, obj, params, log_level):
                 raise bt2.TryAgain
 
         query_exec = bt2.QueryExecutor()
         query_exec.cancel()
 
-        with self.assertRaises(bt2.QueryExecutorCanceled):
+        with self.assertRaises(bt2.Canceled):
             res = query_exec.query(MySink, 'obj', [17, 23])
-
-    def test_eq(self):
-        query_exec = bt2.QueryExecutor()
-        self.assertEqual(query_exec, query_exec)
-
-    def test_eq_invalid(self):
-        query_exec = bt2.QueryExecutor()
-        self.assertNotEqual(query_exec, 23)