From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 21 Mar 2019 14:57:25 +0000 (+0100)
Subject: pytests: omit verbose log for query flood test
X-Git-Tag: v4.0.0~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2fdbb985f7199234f47d4c1c4cf865b66528470;p=thirdparty%2Fknot-resolver.git

pytests: omit verbose log for query flood test
---

diff --git a/tests/pytests/conftest.py b/tests/pytests/conftest.py
index e10ba3a79..37aa178e8 100644
--- a/tests/pytests/conftest.py
+++ b/tests/pytests/conftest.py
@@ -11,6 +11,12 @@ def kresd(tmpdir):
         yield kresd
 
 
+@pytest.fixture
+def kresd_silent(tmpdir):
+    with make_kresd(tmpdir, verbose=False) as kresd:
+        yield kresd
+
+
 @pytest.fixture
 def kresd_tt(tmpdir):
     with make_kresd(tmpdir, 'tt') as kresd:
@@ -33,6 +39,22 @@ def make_kresd_sock(request, kresd):
     return _make_kresd_sock
 
 
+@pytest.fixture(params=[
+    'ip_tcp_socket',
+    'ip6_tcp_socket',
+    'ip_tls_socket',
+    'ip6_tls_socket',
+])
+def make_kresd_silent_sock(request, kresd_silent):
+    """Factory function to create sockets of the same kind (no verbose)."""
+    sock_func = getattr(kresd_silent, request.param)
+
+    def _make_kresd_sock():
+        return sock_func()
+
+    return _make_kresd_sock
+
+
 @pytest.fixture
 def kresd_sock(make_kresd_sock):
     return make_kresd_sock()
diff --git a/tests/pytests/test_conn_mgmt.py b/tests/pytests/test_conn_mgmt.py
index c4b1cbaba..3d3f341fa 100644
--- a/tests/pytests/test_conn_mgmt.py
+++ b/tests/pytests/test_conn_mgmt.py
@@ -193,9 +193,9 @@ def test_query_flood_no_recv(make_kresd_sock):
     (0, 1, 0),
     (1024, 1, 0),
 ])
-def test_query_flood_garbage(make_kresd_sock, glength, gcount, delay, query_before):
+def test_query_flood_garbage(make_kresd_silent_sock, glength, gcount, delay, query_before):
     """Flood resolver with prefixed garbage."""
-    sock1 = make_kresd_sock()
+    sock1 = make_kresd_silent_sock()
     if query_before:
         utils.ping_alive(sock1)
 
@@ -209,5 +209,5 @@ def test_query_flood_garbage(make_kresd_sock, glength, gcount, delay, query_befo
             sock1.sendall(buff)
             time.sleep(delay)
 
-    sock2 = make_kresd_sock()
+    sock2 = make_kresd_silent_sock()
     utils.ping_alive(sock2)  # resolver must stay alive