From fe6be5e20f6f213b395986c025a87dcd0eadd4d4 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 10 Jul 2019 21:26:18 +0200
Subject: [PATCH] backport #8049: ixfrdist: test in CircleCI; remove useless
 error

---
 .circleci/config.yml                    | 36 ++++++++++++++++++++++++-
 regression-tests.ixfrdist/test_Stats.py | 11 --------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c53b51da0a..eef1d2f5c4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,6 +164,18 @@ commands:
             default-libmysqlclient-dev \
             unixodbc
 
+  install-ixfrdist-deps:
+    description: "Install all libraries needed for testing ixfrdist"
+    steps:
+      - run: apt-get update
+      - run:
+          command: |
+            apt-get install -qq -y \
+              libboost-all-dev \
+              libsystemd0 \
+              libyaml-cpp0.5v5 \
+              virtualenv
+
   install-auth-dev-deps:
     description: Install all packages needed to build the auth
     steps:
@@ -190,6 +202,7 @@ commands:
               libsqlite3-dev \
               libssl-dev \
               libtool \
+              libyaml-cpp-dev \
               make \
               pkg-config \
               ragel \
@@ -298,7 +311,8 @@ jobs:
               --enable-tools \
               --with-lmdb=/usr \
               --with-libsodium \
-              --prefix=/opt/pdns-auth
+              --prefix=/opt/pdns-auth \
+              --enable-ixfrdist
       - run:
           name: build
           command: make -j3 -k
@@ -916,6 +930,23 @@ jobs:
             --form description="master build" \
             https://scan.coverity.com/builds?project=${COVERITY_PROJECT}
 
+  test-ixfrdist-regression:
+    docker:
+      - image: debian:stretch
+        environment:
+          UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
+    steps:
+      - install-ixfrdist-deps
+      - checkout-shallow
+      - attach_workspace:
+          at: /opt
+      - run:
+          name: Run ixfrdist tests
+          workdir: ~/project/regression-tests.ixfrdist
+          command: |
+            IXFRDISTBIN="/opt/pdns-auth/bin/ixfrdist" \
+            ./runtests
+
 workflows:
   version: 2
   coverity:
@@ -968,3 +999,6 @@ workflows:
       - test-auth-regress-tinydns:
           requires:
             - build-auth
+      - test-ixfrdist-regression:
+          requires:
+            - build-auth
diff --git a/regression-tests.ixfrdist/test_Stats.py b/regression-tests.ixfrdist/test_Stats.py
index 3ded02822e..7de72530af 100644
--- a/regression-tests.ixfrdist/test_Stats.py
+++ b/regression-tests.ixfrdist/test_Stats.py
@@ -3,18 +3,7 @@ from xfrserver.xfrserver import AXFRServer
 import time
 import requests
 
-zones = {
-    1: """
-$ORIGIN example.
-@        86400   SOA    foo bar 1 2 3 4 5
-@        4242    NS     ns1.example.
-@        4242    NS     ns2.example.
-ns1.example.    4242    A       192.0.2.1
-ns2.example.    4242    A       192.0.2.2
-"""}
-
 xfrServerPort = 4244
-xfrServer = AXFRServer(xfrServerPort, zones)
 
 class IXFRDistStatsTest(IXFRDistTest):
     """
-- 
2.47.2