- Fix tests for new rrset-roundrobin default.

diff --git a/doc/Changelog b/doc/Changelog
index 91d096aab3fba567242a8f17e2dc1d162554f6de..1154f0eb5be76eed4aab9dbf9d66bca11f684452 100644 (file)
--- 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 602dffaff14a918b5eedc90dc524e4f896fa967c..b38407637320717dcef3e0daf24f4348edefeed4 100644 (file)
--- 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 4fc7e508bf5600064b6f543e9638f445aa883b2a..a42be424e9e9a35b623368b4b4f9f951fb01556e 100644 (file)
--- 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