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 0888695de8bfcbd06ba6c0c1cb68298de7c935e6..c2bb764817e4d07ea4ab25d150587e0ebaa7e827 100755 (executable)
--- 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 b2a7335625b0413d00ab7f85d39555da9f5faa91..5bf8b87e2ebbaaaac0fc3e0cd33667907762cf46 100644 (file)
--- 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 af273706bb222e4327b6bf14733ca4ac02fe82bd..07f0f4c10cd55dd80761ba27c71fa36a093f11a7 100644 (file)
--- 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 54e5a2c95b20e26d175450b1294dc477a98f4630..7cc108200b7c7e16726b2c666ef736f183fe68f8 100644 (file)
--- 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 62439eb4ff08256e6f1fdb78b550442a14c67e27..6dbca2c27ded2fd8236ab7148924608805e398fd 100644 (file)
--- 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 2814b3e6a411394f8456043c86e80af5b92ae46f..ed19c5c26726dfcfc6d62fa9b1e90543c68d16fa 100644 (file)
--- 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.