]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix xferquota system test
authorMatthijs Mekking <matthijs@isc.org>
Thu, 29 Feb 2024 10:12:50 +0000 (11:12 +0100)
committerMatthijs Mekking <matthijs@isc.org>
Wed, 6 Mar 2024 09:49:02 +0000 (10:49 +0100)
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

index dbc29b937dc90c61ea1671726f745096406eb611..ee71ec8488ae94368e7307c7687a21a19790f4a0 100644 (file)
@@ -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