pytests: parametrize test_prefix_trailing_garbage

diff --git a/tests/pytests/conftest.py b/tests/pytests/conftest.py
index 9e7370d31d516971c751714c78cbc5a3ee14a317..0a0431bff13b21886fadc86863734b150f5709a3 100644 (file)
--- a/tests/pytests/conftest.py
+++ b/tests/pytests/conftest.py
@@ -51,6 +51,22 @@ def sock_family(request):
     return request.param
 
 
+@pytest.fixture(params=[
+    True,
+    False
+])
+def single_buffer(request):  # whether to send all data in a single buffer
+    return request.param
+
+
+@pytest.fixture(params=[
+    True,
+    False
+])
+def query_before(request):  # whether to send an initial query
+    return request.param
+
+
 @pytest.mark.optionalhook
 def pytest_metadata(metadata):  # filter potentially sensitive data from GitLab CI
     keys_to_delete = []

diff --git a/tests/pytests/test_conn_mgmt.py b/tests/pytests/test_conn_mgmt.py
index 4613b64685d4edb0416804756021fb453c580a1c..b5ff92b6c2fa5373ffb725504b76791e3b02d53a 100644 (file)
--- a/tests/pytests/test_conn_mgmt.py
+++ b/tests/pytests/test_conn_mgmt.py
@@ -9,22 +9,6 @@ import pytest
 import utils
 
 
-@pytest.fixture(params=[
-    True,
-    False
-])
-def single_buffer(request):  # whether to send all data in a single buffer
-    return request.param
-
-
-@pytest.fixture(params=[
-    True,
-    False
-])
-def query_before(request):  # whether to send an initial query
-    return request.param
-
-
 @pytest.mark.parametrize('garbage_lengths', [
     (1,),
     (1024,),

diff --git a/tests/pytests/test_prefix.py b/tests/pytests/test_prefix.py
index 389ef99d5754124daae6c72c1b682d212f72dba2..ed61502052f8f5cc83df486ca8fc6bbdf22de8db 100644 (file)
--- a/tests/pytests/test_prefix.py
+++ b/tests/pytests/test_prefix.py
@@ -105,11 +105,22 @@ def test_prefix_cuts_message(kresd_sock, send_query_before):
     send_invalid_repeatedly(kresd_sock, invalid_buff)
 
 
-def test_trailing_garbage(kresd_sock):
+@pytest.mark.parametrize('glength', [
+    0,
+    1,
+    8,
+    1024,
+    4096,
+    20000,
+])
+def test_prefix_trailing_garbage(kresd_sock, glength, query_before):
     """Send messages with trailing garbage (its length included in prefix)."""
+    if query_before:
+        utils.ping_alive(kresd_sock)
+
     for _ in range(10):
         wire, msgid = utils.prepare_wire()
-        wire += utils.get_garbage(8)
+        wire += utils.get_garbage(glength)
         buff = utils.prepare_buffer(wire)
 
         kresd_sock.sendall(buff)