VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-23 00:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Travis LDAP testing to use new container setup script

Browse Source 
provided by test framework.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878889 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2020-06-16 14:07:53 +00:00
parent 6f18d5fcf4
commit d76121b167
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/travis_Dockerfile_slapd
View File

@ -4,6 +4,6 @@ RUN echo slapd slapd/password2 password travis | debconf-set-selections
RUN echo slapd slapd/internal/adminpw password travis | debconf-set-selections
RUN echo slapd slapd/internal/generated_adminpw password travis | debconf-set-selections
RUN echo slapd slapd/domain string example.com | debconf-set-selections
RUN apt-get update && apt-get -y install slapd
RUN apt-get update && apt-get -y install slapd ldap-utils
# With -d passed, slapd stays in the foreground
CMD /usr/sbin/slapd -d1
CMD /usr/sbin/slapd -d1 '-h ldap:// ldapi:///'

11
test/travis_before_linux.sh
View File

@ -83,12 +83,11 @@ fi
# For LDAP testing, run slapd listening on port 8389 and populate the
# directory as described in t/modules/ldap.t in the test framework:
LDIF=test/perl-framework/scripts/httpd.ldif
if test -v TEST_LDAP -a -r $LDIF ; then
docker build -t httpd_slapd -f test/travis_Dockerfile_slapd test/
docker run -d -p 8389:389 httpd_slapd | tee .slapd.cid
sleep 5
ldapadd -H ldap://localhost:8389 -D cn=admin,dc=example,dc=com -w travis < $LDIF
if test -v TEST_LDAP -a -x test/perl-framework/scripts/ldap-init.sh; then
docker build -t httpd_ldap -f test/travis_Dockerfile_slapd test/
pushd test/perl-framework
./scripts/ldap-init.sh
popd
fi
if test -v APR_VERSION; then