Change close window integration test behavior

diff --git a/itest/test_buffer.py b/itest/test_buffer.py
index e1c9d57bfaa7bc33470fcecae0c5d160085b0574..c79570d56f9bd663676ff35a07c0d143bd07dbbd 100644 (file)
--- a/itest/test_buffer.py
+++ b/itest/test_buffer.py
@@ -113,8 +113,6 @@ class TestBuffer(TestBase):
             self.db.dbname,
             'buf/'))
 
-        return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_cluster.py b/itest/test_cluster.py
index 8b47f79bcd219e1a1ae971a519263311eddae001..a686d3938b1358e50bbb25668110afd0e512bf64 100644 (file)
--- a/itest/test_cluster.py
+++ b/itest/test_cluster.py
@@ -62,8 +62,6 @@ class TestCluster(TestBase):
 
         # self.client0.close()
 
-        return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_compression.py b/itest/test_compression.py
index 7579df27a029813cfadefe373e293059b2b8654a..8e92db589c072feb4c74e2b5b0a73bf6faebca0a 100644 (file)
--- a/itest/test_compression.py
+++ b/itest/test_compression.py
@@ -116,8 +116,6 @@ class TestCompression(TestBase):
         # Check the result after rebooting the server
         await self.assertSeries(self.client0, series)
 
-        return False
-
 
 if __name__ == '__main__':
     random.seed(1)

diff --git a/itest/test_group.py b/itest/test_group.py
index e8c9915904b3beed751bdeb757fc99df410bd5b1..5cb5b44c0a562ac5454678a95bba77eb17679c31 100644 (file)
--- a/itest/test_group.py
+++ b/itest/test_group.py
@@ -173,8 +173,6 @@ class TestGroup(TestBase):
         self.client0.close()
         self.client1.close()
 
-        return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_insert.py b/itest/test_insert.py
index 592de753413e0dd20a806fa73780e9acbdb7aea4..bc0aebb08c5c6c2b61100c7f7e6ce1312ed06f75 100644 (file)
--- a/itest/test_insert.py
+++ b/itest/test_insert.py
@@ -184,8 +184,6 @@ class TestInsert(TestBase):
         self.client0.close()
         self.client1.close()
 
-        return False
-
 
 if __name__ == '__main__':
     random.seed(1)

diff --git a/itest/test_list.py b/itest/test_list.py
index 533ecf783057dfc71495f3a64cae76edaed8315b..023c02a124f11f9a70283ee95836606d87db8afc 100644 (file)
--- a/itest/test_list.py
+++ b/itest/test_list.py
@@ -105,8 +105,6 @@ class TestList(TestBase):
 
         self.client0.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_log.py b/itest/test_log.py
index 263d7dbb7b050c787c0e1b2eb7577c945c344a3e..f293cf707be0384fe99a0ada5993eee7a19a0191 100644 (file)
--- a/itest/test_log.py
+++ b/itest/test_log.py
@@ -233,8 +233,6 @@ class TestLog(TestBase):
 
         await self.test_data()
 
-        # return False
-
     async def test_data(self):
         self.assertEqual(
             await self.client0.query('select * from "log"'),

diff --git a/itest/test_pipe_support.py b/itest/test_pipe_support.py
index 8739c8fff13a747222fb499647d6175a3461337e..76f7b920c50eb5a72ce1a69a918411b3d2ea27dc 100644 (file)
--- a/itest/test_pipe_support.py
+++ b/itest/test_pipe_support.py
@@ -72,8 +72,6 @@ class TestPipeSupport(TestBase):
 
         pipe_client0.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_pool.py b/itest/test_pool.py
index efbbadc6c18fa27830c1799c366cd8fe80bc93ff..1425bcfc3cf222bf2340d9264e4ff3b74c839177 100644 (file)
--- a/itest/test_pool.py
+++ b/itest/test_pool.py
@@ -91,8 +91,6 @@ class TestPool(TestBase):
         self.client2.close()
         self.client3.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_select.py b/itest/test_select.py
index d2070b88d04a10a380dfdaa1a07c1a0b88995782..476fbad75674c67aaaedaef64782acc50be0b064 100644 (file)
--- a/itest/test_select.py
+++ b/itest/test_select.py
@@ -351,44 +351,44 @@ class TestSelect(TestBase):
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use mean\(\) on string type\.'):
+                r'Cannot use mean\(\) on string type\.'):
             await self.client0.query('select mean(1w) from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Group by time must be an integer value larger than zero\.'):
+                r'Group by time must be an integer value larger than zero\.'):
             await self.client0.query('select mean(0) from "aggr"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Limit must be an integer value larger than zero\.'):
+                r'Limit must be an integer value larger than zero\.'):
             await self.client0.query('select limit(6 - 6, mean) from "aggr"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use a string filter on number type\.'):
+                r'Cannot use a string filter on number type\.'):
             await self.client0.query(
                 'select * from "aggr" '
                 'merge as "t" using filter("0")')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use difference\(\) on string type\.'):
+                r'Cannot use difference\(\) on string type\.'):
             await self.client0.query('select difference() from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use derivative\(\) on string type\.'):
+                r'Cannot use derivative\(\) on string type\.'):
             await self.client0.query('select derivative(6, 3) from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use derivative\(\) on string type\.'):
+                r'Cannot use derivative\(\) on string type\.'):
             await self.client0.query('select derivative() from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Overflow detected while using sum\(\)\.'):
+                r'Overflow detected while using sum\(\)\.'):
             await self.client0.query('select sum(now) from "huge"')
 
         with self.assertRaisesRegex(
@@ -487,8 +487,6 @@ class TestSelect(TestBase):
 
         self.client0.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_series.py b/itest/test_series.py
index 716ffe535f20fb8f9a295b98219d6ec9dfc7f68d..384b83ffd2fdc585d61aea9c542ed5eae8ab3022 100644 (file)
--- a/itest/test_series.py
+++ b/itest/test_series.py
@@ -109,8 +109,6 @@ class TestSeries(TestBase):
 
         self.client0.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_server.py b/itest/test_server.py
index 1a41af1f6337cba1372f279f0f49ffc0be6b2211..6572802becfdca0c69fcf1d856de2dc0897f4f35 100644 (file)
--- a/itest/test_server.py
+++ b/itest/test_server.py
@@ -146,8 +146,6 @@ class TestServer(TestBase):
         self.client0.close()
         self.client1.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_syslog.py b/itest/test_syslog.py
index 734b576890446d6f90721540aff17f552d6b36a1..1a13eb90e12fa3397fa1ea94e5963605f5584bb8 100644 (file)
--- a/itest/test_syslog.py
+++ b/itest/test_syslog.py
@@ -37,8 +37,8 @@ from testing import parse_args
 SYSLOG = '/home/joente/syslog.log'
 FMT = '%b %d %H:%M:%S'
 MTCH = re.compile(
-    '(\w\w\w\s[\d\s]\d\s\d\d:\d\d:'
-    '\d\d)\s(\w+)\s([\w\-\.\/@]+)(\[\d+\])?:\s(.*)')
+    r'(\w\w\w\s[\d\s]\d\s\d\d:\d\d:'
+    r'\d\d)\s(\w+)\s([\w\-\.\/@]+)(\[\d+\])?:\s(.*)')
 
 
 class TestSyslog(TestBase):
@@ -84,8 +84,6 @@ class TestSyslog(TestBase):
 
         self.client0.close()
 
-        return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/test_tee.py b/itest/test_tee.py
index 86bb104d1c68461a83fd2d14514a63f86da096aa..f29080ed473eb5c2a199995a77aa498614cab459 100644 (file)
--- a/itest/test_tee.py
+++ b/itest/test_tee.py
@@ -43,11 +43,11 @@ DATA = {
         [1447253244, 533], [1447253549, 538],
         [1447253849, 534], [1447254149, 532],
         [1447254449, 533], [1447254748, 537]],
-    # 'huge': [
-    #     [1471254705, 9223372036854775807],
-    #     [1471254706, 9223372036854775806],
-    #     [1471254707, 9223372036854775805],
-    #     [1471254708, 9223372036854775804]],
+    'huge': [
+        [1471254705, 9223372036854775807],
+        [1471254706, 9223372036854775806],
+        [1471254707, 9223372036854775805],
+        [1471254708, 9223372036854775804]],
     'equal ts': [
         [1471254705, 0], [1471254705, 1], [1471254705, 1],
         [1471254707, 0], [1471254707, 1], [1471254708, 0],
@@ -98,7 +98,6 @@ class TestTee(TestBase):
                 self._tee_data[k] = []
             self._tee_data[k].extend(v)
 
-
     @default_test_setup(2)
     async def run(self):
         self._tee_data = {}
@@ -116,7 +115,7 @@ class TestTee(TestBase):
 
         self.assertEqual(
             await self.client0.insert(DATA),
-            {'success_msg': 'Successfully inserted 56 point(s).'})
+            {'success_msg': 'Successfully inserted 60 point(s).'})
 
         self.assertAlmostEqual(
             await self.client0.query('select * from "series float"'),
@@ -151,13 +150,12 @@ class TestTee(TestBase):
 
         self.assertEqual(
             await self.client0.insert(DATA),
-            {'success_msg': 'Successfully inserted 56 point(s).'})
+            {'success_msg': 'Successfully inserted 60 point(s).'})
 
         self.assertEqual(DATA, self._tee_data)
 
         self.client0.close()
-
-        return False
+        self.client1.close()
 
 
 if __name__ == '__main__':

diff --git a/itest/test_user.py b/itest/test_user.py
index b60bc645f86314c74d4ae3da7adae79ebc101a56..0f3de3ac923ba6be71009a321a6d6a47e0b3bd26 100644 (file)
--- a/itest/test_user.py
+++ b/itest/test_user.py
@@ -185,8 +185,6 @@ class TestUser(TestBase):
         self.client1.close()
         self.client2.close()
 
-        # return False
-
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/testing/testbase.py b/itest/testing/testbase.py
index 1cdd4d3893e2e7a540e5721f281a59389fbbcdab..8c1fe7ce98b8be09fdb94f0067fcd4bd77df780e 100644 (file)
--- a/itest/testing/testbase.py
+++ b/itest/testing/testbase.py
@@ -28,7 +28,7 @@ def default_test_setup(nservers=1, **kwargs):
 
             close = await func(self)
 
-            if close or close is None or Server.TERMINAL is None:
+            if Server.TERMINAL is None or Server.HOLD_TERM is not True:
                 for server in self.servers:
                     result = await server.stop()
                     self.assertTrue(