From 584c2cf804590ea03553e627712a4e4ef40036c1 Mon Sep 17 00:00:00 2001 From: George Thessalonikefs Date: Tue, 21 Apr 2020 22:02:56 +0200 Subject: [PATCH] - Fix tests for new rrset-roundrobin default. --- doc/Changelog | 1 + testcode/testbound.c | 2 ++ testcode/unitmain.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/doc/Changelog b/doc/Changelog index 91d096aab..1154f0eb5 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -6,6 +6,7 @@ 21 April 2020: George - Change default value for 'rrset-roundrobin' to yes. + - Fix tests for new rrset-roundrobin default. 20 April 2020: Wouter - Fix #222: --enable-rpath, fails to rpath python lib. diff --git a/testcode/testbound.c b/testcode/testbound.c index 602dffaff..b38407637 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -274,6 +274,8 @@ setup_config(FILE* in, int* lineno, int* pass_argc, char* pass_argv[]) fprintf(cfg, " pidfile: \"\"\n"); fprintf(cfg, " val-log-level: 2\n"); fprintf(cfg, "remote-control: control-enable: no\n"); + /* some basic settings to facilitate testing */ + fprintf(cfg, "server: rrset-roundrobin: no\n"); while(fgets(line, MAX_LINE_LEN-1, in)) { parse = line; (*lineno)++; diff --git a/testcode/unitmain.c b/testcode/unitmain.c index 4fc7e508b..a42be424e 100644 --- a/testcode/unitmain.c +++ b/testcode/unitmain.c @@ -867,6 +867,8 @@ main(int argc, char* argv[]) printf("\tperforms unit tests.\n"); return 1; } + /* Disable roundrobin for the unit tests */ + RRSET_ROUNDROBIN = 0; #ifdef USE_LIBEVENT printf("Start of %s+libevent unit test.\n", PACKAGE_STRING); #else -- 2.47.2