test: adjust sleeps and drains when daemons run

diff --git a/test/common.py b/test/common.py
index 138858530cc134baaf2e41033ce7f3363f08c074..38c59d588e72c87e1683cb2c4a3dc9d3853ae392 100644 (file)
--- a/test/common.py
+++ b/test/common.py
@@ -63,7 +63,6 @@ class TestWithServers(TestCase):
         sleep(1)
 
     def tearDown(self) -> None:
-        sleep(1)
         for srvname, p in self.children:
             if p.pid is not None:
                 kill(p.pid, SIGINT)

diff --git a/test/test_fuzz.py b/test/test_fuzz.py
index 6be5348394c2ff666973d2dfcc3356cc146a75f6..a5fba68cadd1b85424093f388e24f41ce49a2e59 100644 (file)
--- a/test/test_fuzz.py
+++ b/test/test_fuzz.py
@@ -27,7 +27,7 @@ class Fuzz(TestWithServers):
         sleep(1)  # give collector some time
         send_and_drain(self.sock, None)
         self.sock.close()
-        print("finished fuzzing")
+        sleep(1)  # Let the server close their side
         super().tearDown()
 
     def test_stream(self) -> None:

diff --git a/test/test_storage.py b/test/test_storage.py
index 0c5e260e9243a90265a814e0a08c9a542571c175..889446de24d5d941bc75f9165b2c6d716b4f28fe 100644 (file)
--- a/test/test_storage.py
+++ b/test/test_storage.py
@@ -2,7 +2,7 @@
 
 from random import Random
 from socket import getaddrinfo, socket, AF_INET6, SOCK_STREAM
-from sqlite3 import connect
+from sqlite3 import connect, Row
 from time import sleep
 import unittest
 from .common import send_and_drain, TestWithServers
@@ -23,19 +23,19 @@ class Storage(TestWithServers):
 
     def tearDown(self) -> None:
         sleep(1)  # give collector some time
-        send_and_drain(self.sock, None)
-        self.sock.close()
         super().tearDown()
 
     def test_storage(self) -> None:
         buf = b"xx\r\x01\x03Y3\x90w\x19q\x85\x05\r\n"
         send_and_drain(self.sock, buf)
+        self.sock.close()
         # TODO: make a proper sequence
+        sleep(1)
+        print("checking database")
         with connect(self.conf.get("storage", "dbfn")) as db:
-            c = db.cursor()
-            c.execute("select * from events")
-            events = [dict(row) for row in c]
-        print(events)
+            db.row_factory = Row
+            for row in db.execute("select * from events"):
+                print(dict(row))
 
 
 if __name__ == "__main__":