From: Michal Nowak <mnowak@isc.org>
Date: Mon, 25 May 2026 13:00:43 +0000 (+0000)
Subject: Fix nzd2nzf test always being skipped
X-Git-Tag: v9.21.23~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce9d047a5c102a11f2a0ad5a76931534491a3684;p=thirdparty%2Fbind9.git

Fix nzd2nzf test always being skipped

When LMDB was made a required dependency (929eccdfdc), the "LMDB" entry
was removed from features.py and the --with-lmdb flag was removed from
feature-test.c.  However, the with_lmdb skip marker in mark.py and its
usage in nzd2nzf were not cleaned up. Since FEATURE_LMDB was no longer
being set, the skip condition became permanently true, silently skipping
the test on every run.

Remove the dead skip marker and update other stale references that still
described LMDB as optional (build docs, addzone test comments).

Assisted-by: Claude:claude-opus-4-7
---

diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 0888695de8b..c2bb764817e 100755
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -66,8 +66,7 @@ n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-# When LMDB support is compiled in, this tests that migration from
-# NZF to NZD occurs during named startup
+# Test that migration from NZF to NZD occurs during named startup
 echo_i "checking previously added zone ($n)"
 ret=0
 $DIG $DIGOPTS @10.53.0.2 a.previous.example a >dig.out.ns2.$n || ret=1
diff --git a/bin/tests/system/addzone/tests_rndc_modzone_without_add.py b/bin/tests/system/addzone/tests_rndc_modzone_without_add.py
index b2a7335625b..5bf8b87e2eb 100644
--- a/bin/tests/system/addzone/tests_rndc_modzone_without_add.py
+++ b/bin/tests/system/addzone/tests_rndc_modzone_without_add.py
@@ -29,7 +29,7 @@ def test_rndc_modzone_without_add(ns3):
     """
     # We begin with a zone that has a normal configuration, and then modify it
     # by rndc modzone. This should succeed and shouldn't cause any disruption.
-    # Previously, it triggered an assertion failure unless LMDB was enabled.
+    # Previously, it triggered an assertion failure.
     cmd = ns3.rndc(
         'modzone . {type primary; file "redirect.db"; allow-query {none;};};',
         raise_on_exception=False,
diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index af273706bb2..07f0f4c10cd 100644
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -72,9 +72,6 @@ with_libxml2 = pytest.mark.skipif(
     os.getenv("FEATURE_LIBXML2") != "1", reason="libxml2 support disabled in the build"
 )
 
-with_lmdb = pytest.mark.skipif(
-    os.getenv("FEATURE_LMDB") != "1", reason="LMDB support disabled in the build"
-)
 
 with_json_c = pytest.mark.skipif(
     os.getenv("FEATURE_JSON_C") != "1", reason="json-c support disabled in the build"
diff --git a/bin/tests/system/nzd2nzf/tests_nzd2nzf.py b/bin/tests/system/nzd2nzf/tests_nzd2nzf.py
index 54e5a2c95b2..7cc108200b7 100644
--- a/bin/tests/system/nzd2nzf/tests_nzd2nzf.py
+++ b/bin/tests/system/nzd2nzf/tests_nzd2nzf.py
@@ -15,11 +15,9 @@ import os
 import pytest
 
 import isctest
-import isctest.mark
 import isctest.run
 
 pytestmark = [
-    isctest.mark.with_lmdb,
     pytest.mark.extra_artifacts(
         ["ns1/_default.nzd", "ns1/_default.nzf~"],
     ),
diff --git a/doc/arm/build.inc.rst b/doc/arm/build.inc.rst
index 62439eb4ff0..6dbca2c27de 100644
--- a/doc/arm/build.inc.rst
+++ b/doc/arm/build.inc.rst
@@ -124,8 +124,8 @@ a nonstandard location, adjust ``PKG_CONFIG_PATH`` or use the option
 ``--pkg-config-path``. Compression can be switched off with
 ``-Dzlib=disabled``.
 
-To support storing configuration data for runtime-added zones in an LMDB
-database, the server must be linked with ``liblmdb``
+Configuration data for runtime-added zones is stored in an LMDB database,
+so the server must be linked with ``liblmdb``
 (https://github.com/LMDB/lmdb). If this is installed in a nonstandard
 location, adjust ``PKG_CONFIG_PATH`` or use the option ``--pkg-config-path``.
 
diff --git a/doc/man/README.md b/doc/man/README.md
index 2814b3e6a41..ed19c5c2672 100644
--- a/doc/man/README.md
+++ b/doc/man/README.md
@@ -31,7 +31,7 @@ Sphinx works by handling entire directories and so meson needs to use `depend_fi
 To find which optional manpages need to be built or not, we pass the build directory to sphinx using the environment variable `BIND_BUILD_ROOT`.
 Sphinx will then inspect the meson-generated `intro-targets.json` file to see which optional build components are enabled.
 
-If an optional component like LMDB is disabled in the build directory, its corresponding manpage needs to be removed.
+If an optional component like GeoIP2 is disabled in the build directory, its corresponding manpage needs to be removed.
 From meson's perspective, the entire folder is the output and doesn't concern itself with the insides specifically.
 This is done by checking which optional targets are not built but have the page entry in the output folder.