X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_fuzz.py;h=4ac6f894482343c69df858d901eb87978538f56f;hb=9bdfa9b4a1890f81c4ef1d37db68e81bb17a1b14;hp=6dea449af255ae5c8ad8eabbe5d657880543ab34;hpb=b1dd80b69cf259d4ad3a26c9cf8f9440e3ace0fd;p=loctrkd.git

diff --git a/test/test_fuzz.py b/test/test_fuzz.py
index 6dea449..4ac6f89 100644
--- a/test/test_fuzz.py
+++ b/test/test_fuzz.py
@@ -1,30 +1,47 @@
 """ Send junk to the collector """
 
 from random import Random
-from socket import getaddrinfo, socket, AF_INET6, SOCK_STREAM
-from unittest import TestCase
+from socket import getaddrinfo, socket, AF_INET, SOCK_STREAM
+from time import sleep
+import unittest
+from .common import send_and_drain, TestWithServers
 
 REPEAT: int = 1000000
 
 
-class Fuzz(TestCase):
-    def setUp(self) -> None:
+class Fuzz(TestWithServers):
+    def setUp(self, *args: str) -> None:
+        super().setUp("collector")
         self.rnd = Random()
         for fam, typ, pro, cnm, skadr in getaddrinfo(
-            "::1",
-            4303,
-            family=AF_INET6,
+            "127.0.0.1",
+            self.conf.getint("collector", "port"),
+            family=AF_INET,
             type=SOCK_STREAM,
         ):
             break  # Just take the first element
-        self.sock = socket(AF_INET6, SOCK_STREAM)
+        self.sock = socket(AF_INET, SOCK_STREAM)
         self.sock.connect(skadr)
 
     def tearDown(self) -> None:
+        sleep(1)  # give collector some time
+        send_and_drain(self.sock, None)
         self.sock.close()
+        sleep(1)  # Let the server close their side
+        super().tearDown()
 
-    def test_fuzz(self) -> None:
+    def test_stream(self) -> None:
         for _ in range(REPEAT):
             size = self.rnd.randint(1, 5000)
             buf = self.rnd.randbytes(size)
-            self.sock.send(buf)
+            send_and_drain(self.sock, buf)
+
+    def test_msgs(self) -> None:
+        for _ in range(REPEAT):
+            size = self.rnd.randint(0, 300)
+            buf = b"xx" + self.rnd.randbytes(size) + b"\r\n"
+            send_and_drain(self.sock, buf)
+
+
+if __name__ == "__main__":
+    unittest.main()