X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_fuzz.py;h=6be5348394c2ff666973d2dfcc3356cc146a75f6;hb=14683d91ed3172b416b1c3e5e59edd6528f30a69;hp=0456fda0352ddede2b315fb351bf431b500929ba;hpb=f075dbd6eea0e7326d68fd15a103d668baf67c10;p=loctrkd.git

diff --git a/test/test_fuzz.py b/test/test_fuzz.py
index 0456fda..6be5348 100644
--- a/test/test_fuzz.py
+++ b/test/test_fuzz.py
@@ -1,11 +1,10 @@
 """ Send junk to the collector """
 
 from random import Random
-from socket import getaddrinfo, socket, AF_INET6, MSG_DONTWAIT, SOCK_STREAM
+from socket import getaddrinfo, socket, AF_INET6, SOCK_STREAM
 from time import sleep
-from typing import Optional
 import unittest
-from .common import TestWithServers
+from .common import send_and_drain, TestWithServers
 
 REPEAT: int = 1000000
 
@@ -26,30 +25,22 @@ class Fuzz(TestWithServers):
 
     def tearDown(self) -> None:
         sleep(1)  # give collector some time
-        self._send_and_drain(None)
+        send_and_drain(self.sock, None)
         self.sock.close()
         print("finished fuzzing")
         super().tearDown()
 
-    def _send_and_drain(self, buf: Optional[bytes]) -> None:
-        if buf is not None:
-            self.sock.send(buf)
-        try:
-            self.sock.recv(4096, MSG_DONTWAIT)
-        except BlockingIOError:
-            pass
-
     def test_stream(self) -> None:
         for _ in range(REPEAT):
             size = self.rnd.randint(1, 5000)
             buf = self.rnd.randbytes(size)
-            self._send_and_drain(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"
-            self._send_and_drain(buf)
+            send_and_drain(self.sock, buf)
 
 
 if __name__ == "__main__":