X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=f313b173b6bc5c83c3046b108fb59e4a47cfe855;hb=cfbd7cf3bde05e8a6606478889dcd663604ef7b5;hp=89ddf838b9464397aca970c80104dc70d19ef703;hpb=761e1890bdacd5e9e53c3aa052259b79698b45bd;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py
index 89ddf838..f313b173 100644
--- a/tests/bindings/python/bt2/test_query_executor.py
+++ b/tests/bindings/python/bt2/test_query_executor.py
@@ -1,3 +1,21 @@
+#
+# 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
@@ -10,32 +28,25 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _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):
@@ -43,6 +54,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
                 nonlocal query_params
@@ -58,14 +72,16 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(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)
+        res = bt2.QueryExecutor().query(MySink, 'obj', None, bt2.LoggingLevel.INFO)
         self.assertEqual(query_log_level, bt2.LoggingLevel.INFO)
         del query_log_level
 
@@ -74,6 +90,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
                 raise ValueError
@@ -86,11 +105,14 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
-                raise bt2.InvalidQueryObject
+                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):
@@ -98,6 +120,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
                 pass
@@ -110,6 +135,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
                 pass
@@ -122,11 +150,14 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
-                raise bt2.InvalidQueryParams
+                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):
@@ -134,6 +165,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
                 raise bt2.TryAgain
@@ -152,6 +186,9 @@ class QueryExecutorTestCase(unittest.TestCase):
             def _consume(self):
                 pass
 
+            def _graph_is_configured(self):
+                pass
+
             @classmethod
             def _query(cls, query_exec, obj, params, log_level):
                 raise bt2.TryAgain
@@ -159,5 +196,5 @@ class QueryExecutorTestCase(unittest.TestCase):
         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])