update itest create_database

diff --git a/itest/test_create_database.py b/itest/test_create_database.py
index 6a72685d08aec767b35388cf28556c0e3b7089f5..07c56f030f8974d78dd064f4135b1c95d9df52e5 100644 (file)
--- a/itest/test_create_database.py
+++ b/itest/test_create_database.py
@@ -48,7 +48,7 @@ TIME_PRECISION = 'ns'
 class TestCreateDatabase(TestBase):
     title = 'Test create database'
 
-    @default_test_setup(1, time_precision=TIME_PRECISION)
+    @default_test_setup(2, time_precision=TIME_PRECISION)
     async def run(self):
         await self.client0.connect()
 
@@ -100,8 +100,23 @@ class TestCreateDatabase(TestBase):
                 [1471254705000000010, -2.7]
             ]})
 
-        self.client0.close()
+        await self.db.add_pool(self.server1)
+        await self.assertIsRunning(self.db, self.client0, timeout=20)
+        await asyncio.sleep(45)
+
+        await SiriDB(dbname="dbtest").drop_db(server=self.server1)
 
+        tasks = [
+            asyncio.ensure_future(
+                SiriDB(
+                    dbname="db_{}".format(i)).drop_db(
+                        server=self.server0
+                        ))
+            for i in range(10)]
+
+        await asyncio.gather(*tasks)
+
+        self.client0.close()
 
 if __name__ == '__main__':
     parse_args()

diff --git a/itest/testing/siridb.py b/itest/testing/siridb.py
index 5fa3300c19c74f7fd142ff5849d8b35152b63e8b..9d12ff9a64a47474ab38ba29f5dd6490b8665d45 100644 (file)
--- a/itest/testing/siridb.py
+++ b/itest/testing/siridb.py
@@ -57,40 +57,25 @@ class SiriDB:
         if sleep:
             await asyncio.sleep(sleep)
 
-    async def add_database(
+    async def drop_db(
                 self,
                 server,
-                dbname='dbtest',
-                time_precision='s',
-                buffer_path='',
-                duration_log='1d',
-                duration_num='1w',
-                buffer_size=1024,
+                username='iris',
+                password='siri',
                 sleep=None):
 
-        logging.info('Create database {} on {}'.format(
-            dbname,
-            server.name))
-
         rc = os.system(
             '{service} '
             '-u sa -p siri -s {addr} '
-            'new-database '
+            'drop-database '
             '--db-name {dbname} '
-            '--time-precision {time_precision} '
-            '--duration-log {duration_log} '
-            '--duration-num {duration_num} '
-            '--buffer-size {buffer_size}'
-            '{verbose}'.format(
+            '--ignore-offline '
+            '--force{verbose}'.format(
                 service=SERVICE,
                 addr=server.addr,
-                dbname=dbname,
-                time_precision=time_precision,
-                duration_log=duration_log,
-                duration_num=duration_num,
-                buffer_size=buffer_size,
                 verbose=VERBOSE if self.LOG_LEVEL == 'DEBUG'
-                else ' >/dev/null'))
+                else ' >/dev/null',
+                **vars(self)))
 
         assert rc == 0, 'Expected rc = 0 but got rc = {}'.format(rc)