test fixes

Author: joente

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: |
           sudo apt-get update

itest/lib/__init__.py

@@ -3,7 +3,7 @@
 import random
 from .testbase import TestBase
 from .task import Task
-from .cleanup import cleanup
+from .cleanup import cleanup as clean
 from .cleanup import killall
 from .node import Node
 from .vars import THINGSDB_BIN
@@ -56,7 +56,7 @@ async def _run_test(test):
 """)
 
     try:
-        await test.run()
+        await test.async_run()
     except Exception as e:
         task.stop(success=False)
         if not THINGSDB_KEEP_ON_ERROR:
@@ -72,7 +72,7 @@ async def _run_test(test):
 
 def run_test(test: TestBase):
     loop = asyncio.get_event_loop()
-    cleanup()
+    clean()
     loop.run_until_complete(_run_test(test))
 
 

itest/lib/node.py

@@ -1,12 +1,10 @@
-import sys
 import os
 import asyncio
 import subprocess
 import platform
 import configparser
 import psutil
 import logging
-import io
 import re
 import threading
 from .vars import THINGSDB_BIN
@@ -165,11 +163,21 @@ def write_config(self):
         config = configparser.RawConfigParser()
         config.add_section('thingsdb')
 
-        config.set('thingsdb', 'listen_client_port', self.listen_client_port)
-        config.set('thingsdb', 'listen_node_port', self.listen_node_port)
-        config.set('thingsdb', 'http_api_port', self.http_api_port)
-        config.set('thingsdb', 'http_status_port', self.http_status_port)
-        config.set('thingsdb', 'ws_port', self.ws_port)
+        config.set('thingsdb',
+                   'listen_client_port',
+                   str(self.listen_client_port))
+        config.set('thingsdb',
+                   'listen_node_port',
+                   str(self.listen_node_port))
+        config.set('thingsdb',
+                   'http_api_port',
+                   str(self.http_api_port))
+        config.set('thingsdb',
+                   'http_status_port',
+                   str(self.http_status_port))
+        config.set('thingsdb',
+                   'ws_port',
+                   str(self.ws_port))
 
         config.set('thingsdb', 'bind_client_addr', self.bind_client_addr)
         config.set('thingsdb', 'bind_node_addr', self.bind_node_addr)
@@ -270,13 +278,14 @@ def is_active(self):
         return False if self.proc is None else psutil.pid_exists(self.proc.pid)
 
     def kill(self):
-        command = f'kill -9 {self.proc.pid}'
-        logging.info(f'execute: `{command}``')
-        os.system(command)
+        if self.proc:
+            command = f'kill -9 {self.proc.pid}'
+            logging.info(f'execute: `{command}``')
+            os.system(command)
         self.proc = None
 
     async def stop(self):
-        if self.is_active():
+        if self.is_active() and self.proc:
             os.system('kill {}'.format(self.proc.pid))
             await asyncio.sleep(0.2)
 
@@ -291,7 +300,7 @@ async def stop(self):
         return True
 
     async def shutdown(self, timeout=20):
-        if self.is_active():
+        if self.is_active() and self.proc:
             os.system('kill {}'.format(self.proc.pid))
 
             while timeout:
@@ -304,6 +313,6 @@ async def shutdown(self, timeout=20):
             assert (self.proc.returncode == 0)
 
     def soft_kill(self):
-        if self.is_active():
+        if self.is_active() and self.proc:
             os.system('kill {}'.format(self.proc.pid))
         self.proc = None

itest/lib/target.py

@@ -2,14 +2,20 @@
 import asyncio
 from thingsdb.exceptions import NodeError
 from .client import get_client
+from .node import Node
 
 
 class TestBase(unittest.TestCase):
 
     title = 'no test title'
+    node0: Node
+    node1: Node
+    node2: Node
+    node3: Node
+    node4: Node
 
-    async def run(self):
-        raise NotImplementedError('run must be implemented')
+    async def async_run(self):
+        raise NotImplementedError('async_run must be implemented')
 
     async def wait_nodes_ready(self, client=None, success_count=10):
         if client is None:
@@ -77,7 +83,7 @@ async def assertNoChange(self, client, query):
 
     async def run_tests(self, *args, **kwargs):
         for attr, f in self.__class__.__dict__.items():
-            if attr.startswith('test_') and callable(f):
+            if attr.startswith('test_') and asyncio.iscoroutinefunction(f):
                 client = await get_client(self.node0)
                 await client.query(r"""//ti
                     del_collection('stuff');

itest/lib/testbase.py

@@ -19,7 +19,7 @@ class TestAdvanced(TestBase):
     title = 'Test advanced, single node'
 
     @default_test_setup(num_nodes=1, seed=1, threshold_full_storage=10)
-    async def run(self):
+    async def async_run(self):
 
         self.node0.version()
 

itest/test_advanced.py

@@ -12,7 +12,7 @@ class TestArguments(TestBase):
     title = 'Test arguments'
 
     @default_test_setup(num_nodes=1, seed=1)
-    async def run(self):
+    async def async_run(self):
 
         await self.node0.init_and_run()
 

itest/test_arguments.py

@@ -18,7 +18,7 @@ class TestBackup(TestBase):
         num_nodes=2, seed=1,
         threshold_full_storage=100,
         gcloud_key_file='/tmp/_test_ti.json')
-    async def run(self):
+    async def async_run(self):
 
         await self.node0.init_and_run()
 

itest/test_backup.py

@@ -11,23 +11,23 @@ class TestChanges(TestBase):
     title = 'Test with multiple changes at the same time'
 
     @default_test_setup(num_nodes=4, seed=1, threshold_full_storage=1000000)
-    async def run(self):
+    async def async_run(self):
         x = 50
         mq = '.x += .x % {}; .arr.push(.x);'
 
         await self.node0.init_and_run()
 
         client0 = await get_client(self.node0)
         client0.set_default_scope('//stuff')
-        client0.id = 2
+        setattr(client0, 'id', 2)
 
         await client0.query('.x = 10; .arr = [];')
 
         await self.node1.join_until_ready(client0)
 
         client1 = await get_client(self.node1)
         client1.set_default_scope('//stuff')
-        client1.id = 5
+        setattr(client1, 'id', 5)
 
         for _ in range(x):
             await self.mquery(mq, client0, client1)
@@ -48,7 +48,7 @@ async def run(self):
 
         client2 = await get_client(self.node2)
         client2.set_default_scope('//stuff')
-        client2.id = 9
+        setattr(client2, 'id', 9)
 
         # Added sleep() to test if this prevents a timeout-error which
         # may sometimes happen on the `mquery` below
@@ -95,7 +95,7 @@ async def run(self):
 
         client3 = await get_client(self.node3)
         client3.set_default_scope('//stuff')
-        client3.id = 11
+        setattr(client3, 'id', 11)
 
         await asyncio.sleep(0.5)
         check_arr = await client0.query('.arr;')

itest/test_changes.py

@@ -25,7 +25,7 @@ class TestCollectionFunctions(TestBase):
     title = 'Test collection scope functions'
 
     @default_test_setup(num_nodes=2, seed=1, threshold_full_storage=50000)
-    async def run(self):
+    async def async_run(self):
 
         await self.node0.init_and_run()