test_parenth

diff --git a/itest/run_all.py b/itest/run_all.py
index 1241790013d7a07a22ce5774d483cad57ba80a01..3b3f02f72b1743918117df5d48a7d132e261e76a 100644 (file)
--- a/itest/run_all.py
+++ b/itest/run_all.py
@@ -18,6 +18,7 @@ from test_log import TestLog
 from test_pipe_support import TestPipeSupport
 from test_buffer import TestBuffer
 from test_tee import TestTee
+from test_parentheses import TestParenth
 
 
 if __name__ == '__main__':
@@ -36,3 +37,4 @@ if __name__ == '__main__':
     run_test(TestPipeSupport())
     run_test(TestBuffer())
     run_test(TestTee())
+    run_test(TestParenth())

diff --git a/itest/test_parentheses.py b/itest/test_parentheses.py
index 8f22a6b26cb325fab81ba04eae209edfb27db2b5..080726d06449c90555930e36a00f09282afa164c 100644 (file)
--- a/itest/test_parentheses.py
+++ b/itest/test_parentheses.py
@@ -92,7 +92,10 @@ class TestParenth(TestBase):
                 LENPOINTS)})
 
         self.assertEqual(
-            await self.client0.query('list series all - ("series-001" | "series-002" | /windows.*/)'),
+            await self.client0.query('''
+                list series
+                    all - ("series-001" | "series-002" | /windows.*/)
+               '''),
             {
                 'columns': ['name'],
                 'series': [
@@ -102,6 +105,22 @@ class TestParenth(TestBase):
                     ['linux-002'],
                     ['linux-003'],
                     ['linux-004']]})
+
+        self.assertEqual(
+            await self.client0.query('list series all - ("series-001" | "series-002" | (/windows.*/ & /.*001/))'),
+            {
+                'columns': ['name'],
+                'series': [
+                    ['series-003'],
+                    ['series-004'],
+                    ['linux-001'],
+                    ['linux-002'],
+                    ['linux-003'],
+                    ['linux-004'],
+                    ['windows-002'],
+                    ['windows-003'],
+                    ['windows-004']]})
+
         self.assertEqual(
             await self.client0.query('list series ("series-001" | "series-002" | /windows.*/) - /.*003/'),
             {
@@ -113,16 +132,11 @@ class TestParenth(TestBase):
                     ['windows-002'],
                     ['windows-004']]})
 
-        # self.assertEqual(
-        #     await self.client0.query('list series (/.*001/ & "series-002" | /windows.*/) - /.*003/'),
-        #     {
-        #         'columns': ['name'],
-        #         'series': [
-        #             ['series-001'],
-        #             ['series-002'],
-        #             ['windows-001'],
-        #             ['windows-002'],
-        #             ['windows-004']]})
+        self.assertEqual(
+            await self.client0.query('list series (/.*001/ & /linux.*/) - /.*001/'),
+            {
+                'columns': ['name'],
+                'series': []})
 
         self.assertEqual(
             await self.client0.query(