From 6e43145382fe1991c9b919035fda5a5bb71542e3 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Mon, 21 Aug 2023 16:58:10 +0200 Subject: [PATCH] - Fix unit test for unbound-control to work when threads are disabled, and fix cache dump check. --- doc/Changelog | 2 ++ .../09-unbound-control.test | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index c5dd1d402..a6849c962 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -5,6 +5,8 @@ status=11/SEGV. Fixes cachedb configuration handling. - Fix #923: processQueryResponse() THROWAWAY should be mindful of fail_reply. + - Fix unit test for unbound-control to work when threads are disabled, + and fix cache dump check. 18 August 2023: Wouter - Fix for iter_dec_attempts that could cause a hang, part of diff --git a/testdata/09-unbound-control.tdir/09-unbound-control.test b/testdata/09-unbound-control.tdir/09-unbound-control.test index 0ef679b3f..0a0bd8a18 100644 --- a/testdata/09-unbound-control.tdir/09-unbound-control.test +++ b/testdata/09-unbound-control.tdir/09-unbound-control.test @@ -199,7 +199,7 @@ query www.example.com. cache_dump -c ub.conf expect_exit_value 0 cat cache.dump -expect_in_cache "10.20.30.40" +expect_in_cache_dump "10.20.30.40" control_command -c ub.conf lookup www.example.com expect_exit_value 0 @@ -264,6 +264,7 @@ control_command -c ub.conf reload_keep_cache expect_exit_value 0 cache_dump -c ub.conf expect_exit_value 0 +cat cache.dump expect_in_cache_dump "www.example.com.*10.20.30.40" expect_in_cache_dump "msg www.example.com. IN A" query www.example.com +nordflag @@ -291,6 +292,14 @@ fail_in_cache_dump "msg www.example.com. IN A" query www.example.com expect_answer "10.20.30.40" +# See if this part of the test can be enabled, it needs threads for combined +# output. +have_threads="no" +if grep "define HAVE_PTHREAD 1" $PRE/config.h; then have_threads="yes"; fi +if grep "define HAVE_SOLARIS_THREADS 1" $PRE/config.h; then have_threads="yes"; fi +if grep "define HAVE_WINDOWS_THREADS 1" $PRE/config.h; then have_threads="yes"; fi +if test "$have_threads" = "yes"; then + teststep "change num-threads and reload_keep_cache - should be empty" echo "server: num-threads: 2" >> ub.conf control_command -c ub.conf reload_keep_cache @@ -311,6 +320,12 @@ expect_exit_value 0 expect_in_cache_dump "www.example.com.*10.20.30.40" expect_in_cache_dump "msg www.example.com. IN A" +else + echo "" + echo "> skip test parts that need threads, have_threads=no" +# end of check for have_threads +fi + teststep "now stop the server" control_command -c ub.conf stop expect_exit_value 0