ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '3535-fetchlimit-test-flaky-9.18' into 'bind-9.18'

Browse Source 
[9.18] Allow the fetchlimit test to be re-run

See merge request isc-projects/bind9!8657
This commit is contained in:
Tom Krizek
2024-01-17 16:34:53 +00:00
parent 17efc13cab a1af755a14
commit 705924d233
11 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tests/system/fetchlimit/tests_sh_fetchlimit.py
View File

@@ -9,6 +9,9 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import isctest.mark
@isctest.mark.flaky(max_runs=2)
def test_fetchlimit(run_tests_sh):
run_tests_sh()

5
bin/tests/system/isctest/__init__.py
View File

@@ -14,3 +14,8 @@ from . import instance
from . import query
from . import rndc
from . import log
# isctest.mark module is intentionally NOT imported, because it relies on
# environment variables which might not be set at the time of import of the
# `isctest` package. To use the marks, manual `import isctest.mark` is needed
# instead.

2
bin/tests/system/pytest_custom_markers.py → bin/tests/system/isctest/mark.py
View File

@@ -43,7 +43,7 @@ have_json_c = pytest.mark.skipif(
try:
import flaky as flaky_pkg
import flaky as flaky_pkg # type: ignore
except ModuleNotFoundError:
# In case the flaky package is not installed, run the tests as usual
# without any attempts to re-run them.

4
bin/tests/system/nsupdate/tests_sh_nsupdate.py
View File

@@ -11,12 +11,12 @@
import platform
import pytest_custom_markers
import isctest.mark
MAX_RUNS = 2 if platform.system() == "FreeBSD" else 1 # GL#3846
@pytest_custom_markers.flaky(max_runs=MAX_RUNS)
@isctest.mark.flaky(max_runs=MAX_RUNS)
def test_nsupdate(run_tests_sh):
run_tests_sh()

4
bin/tests/system/qmin/tests_sh_qmin.py
View File

@@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import pytest_custom_markers
import isctest.mark
# The qmin test is inherently unstable, see GL #904 for details.
@pytest_custom_markers.flaky(max_runs=3)
@isctest.mark.flaky(max_runs=3)
def test_qmin(run_tests_sh):
run_tests_sh()

4
bin/tests/system/reclimit/tests_sh_reclimit.py
View File

@@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import pytest_custom_markers
import isctest.mark
# The reclimit is known to be quite unstable. GL #1587
@pytest_custom_markers.flaky(max_runs=2)
@isctest.mark.flaky(max_runs=2)
def test_reclimit(run_tests_sh):
run_tests_sh()

4
bin/tests/system/rrl/tests_sh_rrl.py
View File

@@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import pytest_custom_markers
import isctest.mark
# The rrl is known to be quite unstable. GL #172
@pytest_custom_markers.flaky(max_runs=2)
@isctest.mark.flaky(max_runs=2)
def test_rrl(run_tests_sh):
run_tests_sh()

4
bin/tests/system/statistics/tests_sh_statistics.py
View File

@@ -9,9 +9,9 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import pytest_custom_markers
import isctest.mark
@pytest_custom_markers.flaky(max_runs=2) # GL#1621
@isctest.mark.flaky(max_runs=2) # GL#1621
def test_statistics(run_tests_sh):
run_tests_sh()

4
bin/tests/system/statschannel/tests_json.py
View File

@@ -15,12 +15,12 @@ from datetime import datetime
import pytest
import pytest_custom_markers
import isctest.mark
pytest.register_assert_rewrite("generic")
import generic
pytestmark = pytest_custom_markers.have_json_c
pytestmark = isctest.mark.have_json_c
requests = pytest.importorskip("requests")

4
bin/tests/system/statschannel/tests_xml.py
View File

@@ -16,12 +16,12 @@ import xml.etree.ElementTree as ET
import pytest
import pytest_custom_markers
import isctest.mark
pytest.register_assert_rewrite("generic")
import generic
pytestmark = pytest_custom_markers.have_libxml2
pytestmark = isctest.mark.have_libxml2
requests = pytest.importorskip("requests")

8
bin/tests/system/timeouts/tests_tcp_timeouts.py
View File

@@ -26,7 +26,7 @@ import dns.query
import dns.rdataclass
import dns.rdatatype
import pytest_custom_markers # pylint: disable=import-error
import isctest.mark # pylint: disable=import-error
TIMEOUT = 10
@@ -185,7 +185,7 @@ def test_long_axfr(named_port):
assert soa is not None
@pytest_custom_markers.flaky(max_runs=3)
@isctest.mark.flaky(max_runs=3)
def test_send_timeout(named_port):
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
sock.connect(("10.53.0.1", named_port))
@@ -212,7 +212,7 @@ def test_send_timeout(named_port):
raise EOFError from e
@pytest_custom_markers.long_test
@isctest.mark.long_test
def test_max_transfer_idle_out(named_port):
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
sock.connect(("10.53.0.1", named_port))
@@ -246,7 +246,7 @@ def test_max_transfer_idle_out(named_port):
assert soa is None
@pytest_custom_markers.long_test
@isctest.mark.long_test
def test_max_transfer_time_out(named_port):
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
sock.connect(("10.53.0.1", named_port))