Merge branch 'fir4-cibats' into hotfix-1.1.9

image/service/slapd/test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+# Copy testing data to their respective directories on an as-needed basis
+mkdir -p /var/lib/ldap
+mkdir -p /etc/ldap/slapd.d
+cp -rf /container/test/database/* /var/lib/ldap/ || true
+cp -rf /container/test/config/* /etc/ldap/slapd.d/ || true

test/test.bats

@@ -37,21 +37,17 @@ load test_helper
   run docker exec $CONTAINER_ID ldapsearch -x -h ldap.osixia.net -b dc=example,dc=org -ZZ -D "cn=admin,dc=example,dc=org" -w admin
   clear_container
 
-  chmod -R 777 test/config/ test/database/ test/ssl/
-
   [ "$status" -eq 0 ]
 
 }
 
 @test "ldapsearch existing database and config" {
 
-  run_image -h ldap.example.org -e LDAP_TLS=false -v $BATS_TEST_DIRNAME/database:/var/lib/ldap -v $BATS_TEST_DIRNAME/config:/etc/ldap/slapd.d
+  run_image -h ldap.example.org -e LDAP_TLS=false -v $BATS_TEST_DIRNAME/database:/container/test/database -v $BATS_TEST_DIRNAME/config:/container/test/config
   wait_process slapd
   run docker exec $CONTAINER_ID ldapsearch -x -h ldap.example.org -b dc=osixia,dc=net -D "cn=admin,dc=osixia,dc=net" -w admin
   clear_container
 
-  chmod -R 777 test/config/ test/database/ test/ssl/
-
   [ "$status" -eq 0 ]
 
 }

test/test_helper.bash

@@ -9,7 +9,7 @@ build_image() {
 }
 
 run_image() {
-  CONTAINER_ID=$(docker run $@ -d $IMAGE_NAME)
+  CONTAINER_ID=$(docker run $@ -d $IMAGE_NAME --copy-service -c "/container/service/slapd/test.sh")
   CONTAINER_IP=$(get_container_ip_by_cid $CONTAINER_ID)
 }