From 49dad2c12e38b7523b690af129e069bb9706e044 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Thu, 29 Feb 2024 11:12:50 +0100 Subject: [PATCH] Fix xferquota system test The change from RBT to QP has changed the contents of generated zone files slightly: node names are now always absolute, so instead of using $ORIGIN and relative names, generated zone files use full names for all records. This caused a failure in the xferquota system test, which was looking for a relative name in secondary zone files. Replace the string matching with a regular expression to fix the test. --- bin/tests/system/xferquota/tests_xferquota.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/xferquota/tests_xferquota.py b/bin/tests/system/xferquota/tests_xferquota.py index dbc29b937d..ee71ec8488 100644 --- a/bin/tests/system/xferquota/tests_xferquota.py +++ b/bin/tests/system/xferquota/tests_xferquota.py @@ -36,7 +36,7 @@ def test_xferquota(named_port, servers): with open(file_path, "r", encoding="utf-8") as zonefile: # Count the number of lines containing the search string for line in zonefile: - if "xyzzy A 10.0.0.2" in line: + if re.search(r"xyzzy.zone[0-9]+.example.*A\s+10\.0\.0\.2", line): matching_line_count += 1 return matching_line_count == 300