From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 8 May 2019 13:18:54 +0000 (+0200)
Subject: Remove LDAP testing from Travis
X-Git-Tag: rec-4.2.0-rc1~26^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5d4d8943fd63d59f6eac89d840b39083577f862;p=pdns

Remove LDAP testing from Travis
---

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index fb7acaf58..d4275eb59 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -220,10 +220,6 @@ install_auth() {
     libyaml-cpp-dev \
     libmaxminddb-dev"
 
-  # ldap-backend
-  run "sudo apt-get -qq --no-install-recommends install \
-    libldap-dev"
-
   # lmdb-backend
   run "sudo apt-get -qq --no-install-recommends install \
     liblmdb-dev"
@@ -295,22 +291,6 @@ install_auth() {
   run 'echo ${HOME}/.odbc.ini'
   run 'cat ${HOME}/.odbc.ini'
 
-  # ldap-backend test setup
-  run "sudo apt-get -qq --no-install-recommends install \
-    slapd \
-    ldap-utils"
-  run "mkdir /tmp/ldap-dns"
-  run "pushd /tmp/ldap-dns"
-  run 'for schema in /etc/ldap/schema/{core,cosine}.schema ${TRAVIS_BUILD_DIR}/modules/ldapbackend/{dnsdomain2,pdns-domaininfo}.schema ; do echo include $schema ; done > ldap.conf'
-  run "mkdir slapd.d"
-  run "slaptest -f ldap.conf -F slapd.d"
-  run "sudo cp slapd.d/cn=config/cn=schema/cn={*dns*.ldif /etc/ldap/slapd.d/cn=config/cn=schema/"
-  run "sudo chown -R openldap:openldap /etc/ldap/slapd.d/"
-  run "sudo service slapd restart"
-  run "popd"
-  run "sudo -u openldap mkdir -p /var/lib/ldap/powerdns"
-  run "sudo ldapadd -Y EXTERNAL -H ldapi:/// -f ./modules/ldapbackend/testfiles/add.ldif"
-
   # remote-backend tests requirements
   run "sudo apt-get -qq --no-install-recommends install \
     ruby-json \
@@ -410,7 +390,7 @@ build_auth() {
   run "autoreconf -vi"
   run "./configure \
     ${sanitizerflags} \
-    --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 ldap lmdb lua mydns opendbx pipe random remote tinydns godbc lua2' \
+    --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 lmdb lua mydns opendbx pipe random remote tinydns godbc lua2' \
     --with-modules='' \
     --with-sqlite3 \
     --with-libsodium \
@@ -512,10 +492,6 @@ test_auth() {
   #travis unbound is too old for this test (unbound 1.6.0 required)
   run "touch tests/ent-asterisk/fail.nsec"
 
-  run "./timestamp ./start-test-stop 5300 ldap-tree"
-  run "./timestamp ./start-test-stop 5300 ldap-simple"
-  run "./timestamp ./start-test-stop 5300 ldap-strict"
-
   run "./timestamp ./start-test-stop 5300 bind-both"
   run "./timestamp ./start-test-stop 5300 bind-dnssec-both"
   run "./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-both"