Merge branch 'feature-new-tests' into release-0.8.0

BertrandGouny · BertrandGouny · commit a9f7f47e9a99 · 2014-06-24T15:14:31.000+02:00
diff --git a/test-repository.sh b/test-repository.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Usage
+# sudo ./test.sh 
+# add -v for verbose mode (or type whatever you like !) :p
+
+. test/config-repository
+. test/tools/run.sh
+
+run_test simple.sh "dn: dc=example,dc=com"
+run_test tls.sh "dn: dc=example,dc=com"
+run_test db.sh "dn: dc=otherdomain,dc=com"
+
+. test/tools/end.sh
+
diff --git a/test.sh b/test.sh
@@ -4,6 +4,7 @@
 # sudo ./test.sh 
 # add -v for verbose mode (or type whatever you like !) :p
 
+. test/config
 . test/tools/run.sh
 
 run_test tools/build-container.sh "Successfully built"
diff --git a/test/config b/test/config
@@ -1,3 +1,8 @@
 testImage=openldap-test
 testContainer=openldap-test-container
 testDir=/osixia-test-docker-openldap
+
+export testImage
+export testContainer
+export testDir
+
diff --git a/test/config-repository b/test/config-repository
@@ -0,0 +1,7 @@
+testImage=osixia/openldap:latest
+testContainer=openldap-repository-test-container
+testDir=/osixia-repository-test-docker-openldap
+
+export testImage
+export testContainer
+export testDir
diff --git a/test/db.sh b/test/db.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-. $dir/tools/config.prop
 
 if [ -d "$testDir" ]; then
   rm -r $testDir
diff --git a/test/simple.sh b/test/simple.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-. $dir/tools/config.prop
-
 . $dir/tools/run-container.sh
+
 echo "ldapsearch -x -h $IP -b dc=example,dc=com"
 ldapsearch -x -h $IP -b dc=example,dc=com
 
diff --git a/test/tls.sh b/test/tls.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-. $dir/tools/config.prop
-
 . $dir/tls/run.sh
+
 echo "ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ"
 ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ
 
diff --git a/test/tools/build-container.sh b/test/tools/build-container.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. $(dirname $0)/config.prop
-
 docker.io build -t $testImage .
 #docker.io build --no-cache=true -t $testImage .
 
diff --git a/test/tools/delete-container.sh b/test/tools/delete-container.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. $(dirname $0)/config.prop
-
 # remove test container
 res=$(docker.io ps -a | grep -c "$testContainer")
 
diff --git a/test/tools/delete-image.sh b/test/tools/delete-image.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. $(dirname $0)/config.prop
-
 # remove test image
 res=$(docker.io images | grep -c "$testImage")
 
diff --git a/test/tools/end.sh b/test/tools/end.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-dir=$(dirname $0)
-$dir/delete-container.sh > /dev/null 2>&1
-$dir/delete-image.sh > /dev/null 2>&1
+./test/tools/delete-container.sh 
+./test/tools/delete-image.sh > /dev/null 2>&1
 
 echo "------- End -------"
 echo $error " failed " $ok " succeeded"
