From e7efbceae8429b92e2eeae9da5db3fed613274c2 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.fr>
Date: Tue, 17 Jun 2014 20:54:57 +0200
Subject: [PATCH 1/5] [twgit] Init feature 'feature-new-tests'.


From 857e692b3ce8897cc8bb5c0d5890308a4427b33e Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.fr>
Date: Tue, 17 Jun 2014 21:40:31 +0200
Subject: [PATCH 2/5] news tests

---
 test.sh                               | 49 +++------------------------
 test/build.sh                         |  8 -----
 test/db.sh                            | 20 +++++------
 test/simple.sh                        |  2 +-
 test/tls.sh                           |  4 +--
 test/{tools/end-tls.sh => tls/end.sh} |  0
 test/{tools/run-tls.sh => tls/run.sh} |  6 ++--
 test/{ => tls}/ssl/ca.crt             |  0
 test/{ => tls}/ssl/dhparam.pem        |  0
 test/{ => tls}/ssl/ldap.crt           |  0
 test/{ => tls}/ssl/ldap.key           |  0
 test/tools/build-container.sh         |  7 ++++
 test/tools/config.prop                |  6 ++--
 test/tools/delete-container.sh        |  8 ++---
 test/tools/delete-image.sh            |  6 ++--
 test/tools/end.sh                     |  7 ++--
 test/tools/run-container.sh           | 14 ++++++++
 test/tools/run-simple.sh              | 14 --------
 test/tools/run.sh                     | 46 +++++++++++++++++++++++++
 19 files changed, 102 insertions(+), 95 deletions(-)
 delete mode 100755 test/build.sh
 rename test/{tools/end-tls.sh => tls/end.sh} (100%)
 rename test/{tools/run-tls.sh => tls/run.sh} (68%)
 rename test/{ => tls}/ssl/ca.crt (100%)
 rename test/{ => tls}/ssl/dhparam.pem (100%)
 rename test/{ => tls}/ssl/ldap.crt (100%)
 rename test/{ => tls}/ssl/ldap.key (100%)
 create mode 100755 test/tools/build-container.sh
 create mode 100755 test/tools/run-container.sh
 delete mode 100755 test/tools/run-simple.sh
 create mode 100755 test/tools/run.sh

diff --git a/test.sh b/test.sh
index 024ccd8..06b5bb9 100755
--- a/test.sh
+++ b/test.sh
@@ -2,55 +2,14 @@
 
 # Usage
 # sudo ./test.sh 
-# add -v for verbose mode
+# add -v for verbose mode (or type whatever you like !) :p
 
-verbose=$1
-error=0
-ok=0
+. test/tools/run.sh
 
-echo_start () {
-  echo "------- Start $* test -------"
-}
-
-echo_error () {
-  echo "\n$(tput setaf 1)/!\ $* failed$(tput sgr0)\n"
-  error=`expr $error + 1`
-}
-
-echo_ok () {
-  echo "\n--> $* ok\n"
-  ok=`expr $ok + 1`
-}
-
-run_test () {
-  fction=$1
-  out=test/test.out
-
-  echo_start $fction
-
-  if [ -z ${verbose} ]; then
-    ./test/$1.sh > $out 2>&1
-  else
-    ./test/$1.sh | tee $out 2>&1
-  fi
-  
-  if [ "$(grep -c "$2" $out)" -eq 0 ]; then
-    echo_error $fction
-  else
-    echo_ok  $fction
-  fi
-
-  rm $out
-}
-
-
-./test/tools/prepare.sh > /dev/null 2>&1
-run_test build "Successfully built"
+run_test tools/build-container "Successfully built"
 run_test simple "dn: dc=example,dc=com"
 run_test tls "dn: dc=example,dc=com"
 run_test db "dn: dc=otherdomain,dc=com"
-./test/tools/end.sh > /dev/null 2>&1
 
-echo "------- Test finished -------"
-echo $error " failed " $ok " passed"
+. test/tools/end.sh
 
diff --git a/test/build.sh b/test/build.sh
deleted file mode 100755
index d688f7e..0000000
--- a/test/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-dir=$(dirname $0)
-. $dir/tools/config.prop
-
-docker.io build -t $openldapTestImage .
-#docker.io build --no-cache=true -t $openldapTestImage .
-
diff --git a/test/db.sh b/test/db.sh
index bc0297c..8411776 100755
--- a/test/db.sh
+++ b/test/db.sh
@@ -3,22 +3,22 @@
 dir=$(dirname $0)
 . $dir/tools/config.prop
 
-if [ -d "$openldapTestDir" ]; then
-  rm -r $openldapTestDir
+if [ -d "$testDir" ]; then
+  rm -r $testDir
 fi
 
-mkdir $openldapTestDir
-mkdir $openldapTestDir/db
-mkdir $openldapTestDir/config
+mkdir $testDir
+mkdir $testDir/db
+mkdir $testDir/config
 
-runOptions="-e LDAP_DOMAIN=otherdomain.com -v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
-. $dir/tools/run-simple.sh
+runOptions="-e LDAP_DOMAIN=otherdomain.com -v $testDir/db:/var/lib/ldap -v $testDir/config:/etc/ldap/slapd.d"
+. $dir/tools/run-container.sh
 $dir/tools/delete-container.sh
 
-runOptions="-v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
-. $dir/tools/run-simple.sh
+runOptions="-v $testDir/db:/var/lib/ldap -v $testDir/config:/etc/ldap/slapd.d"
+. $dir/tools/run-container.sh
 echo "ldapsearch -x -h $IP -b dc=otherdomain,dc=com"
 ldapsearch -x -h $IP -b dc=otherdomain,dc=com
 
-rm -r $openldapTestDir
+rm -r $testDir
 $dir/tools/delete-container.sh
diff --git a/test/simple.sh b/test/simple.sh
index 9c63f13..bae1ce2 100755
--- a/test/simple.sh
+++ b/test/simple.sh
@@ -3,7 +3,7 @@
 dir=$(dirname $0)
 . $dir/tools/config.prop
 
-. $dir/tools/run-simple.sh
+. $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
index ccdcd6e..eaa5dab 100755
--- a/test/tls.sh
+++ b/test/tls.sh
@@ -3,8 +3,8 @@
 dir=$(dirname $0)
 . $dir/tools/config.prop
 
-. $dir/tools/run-tls.sh
+. $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
 
-. $dir/tools/end-tls.sh
+. $dir/tls/end.sh
diff --git a/test/tools/end-tls.sh b/test/tls/end.sh
similarity index 100%
rename from test/tools/end-tls.sh
rename to test/tls/end.sh
diff --git a/test/tools/run-tls.sh b/test/tls/run.sh
similarity index 68%
rename from test/tools/run-tls.sh
rename to test/tls/run.sh
index b051d93..5cb892c 100755
--- a/test/tools/run-tls.sh
+++ b/test/tls/run.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 
-runOptions="--dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl"
-. $dir/tools/run-simple.sh
+runOptions="--dns=127.0.0.1 -v `pwd`/test/tls/ssl:/etc/ldap/ssl"
+. $dir/tools/run-container.sh
 
-cert=$(echo $dir/ssl/ldap.crt)
+cert=$(echo $dir/tls/ssl/ldap.crt)
 certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
 addLine=$(echo $IP $certCN)
 
diff --git a/test/ssl/ca.crt b/test/tls/ssl/ca.crt
similarity index 100%
rename from test/ssl/ca.crt
rename to test/tls/ssl/ca.crt
diff --git a/test/ssl/dhparam.pem b/test/tls/ssl/dhparam.pem
similarity index 100%
rename from test/ssl/dhparam.pem
rename to test/tls/ssl/dhparam.pem
diff --git a/test/ssl/ldap.crt b/test/tls/ssl/ldap.crt
similarity index 100%
rename from test/ssl/ldap.crt
rename to test/tls/ssl/ldap.crt
diff --git a/test/ssl/ldap.key b/test/tls/ssl/ldap.key
similarity index 100%
rename from test/ssl/ldap.key
rename to test/tls/ssl/ldap.key
diff --git a/test/tools/build-container.sh b/test/tools/build-container.sh
new file mode 100755
index 0000000..1128c7c
--- /dev/null
+++ b/test/tools/build-container.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. $(dirname $0)/config.prop
+
+docker.io build -t $testImage .
+#docker.io build --no-cache=true -t $testImage .
+
diff --git a/test/tools/config.prop b/test/tools/config.prop
index 30c3a6f..fd412f9 100644
--- a/test/tools/config.prop
+++ b/test/tools/config.prop
@@ -1,3 +1,3 @@
-openldapTestImage=openldap-test
-openldapTestContainer=openldap-test-container
-openldapTestDir=/osixia-test-docker-openldap
+testImage=openldap-test
+testContainer=openldap-test-container
+testDir=/osixia-test-docker-openldap
diff --git a/test/tools/delete-container.sh b/test/tools/delete-container.sh
index b2e7db5..505a00f 100755
--- a/test/tools/delete-container.sh
+++ b/test/tools/delete-container.sh
@@ -2,10 +2,10 @@
 
 . $(dirname $0)/config.prop
 
-# remove openldap test container
-res=$(docker.io ps -a | grep -c "$openldapTestContainer")
+# remove test container
+res=$(docker.io ps -a | grep -c "$testContainer")
 
 if [ $res -ne 0 ]; then
-  docker.io stop $openldapTestContainer
-  docker.io rm $openldapTestContainer
+  docker.io stop $testContainer
+  docker.io rm $testContainer
 fi
diff --git a/test/tools/delete-image.sh b/test/tools/delete-image.sh
index 9808e72..a623f5f 100755
--- a/test/tools/delete-image.sh
+++ b/test/tools/delete-image.sh
@@ -2,9 +2,9 @@
 
 . $(dirname $0)/config.prop
 
-# remove openldap test image
-res=$(docker.io images | grep -c "$openldapTestImage")
+# remove test image
+res=$(docker.io images | grep -c "$testImage")
 
 if [ $res -ne 0 ]; then
-  docker.io rmi $openldapTestImage
+  #docker.io rmi $testImage
 fi
diff --git a/test/tools/end.sh b/test/tools/end.sh
index ea88ee1..af388d5 100755
--- a/test/tools/end.sh
+++ b/test/tools/end.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
 dir=$(dirname $0)
-$dir/delete-container.sh
-$dir/delete-image.sh
+$dir/delete-container.sh > /dev/null 2>&1
+$dir/delete-image.sh > /dev/null 2>&1
+
+echo "------- End -------"
+echo $error " failed " $ok " succeeded"
diff --git a/test/tools/run-container.sh b/test/tools/run-container.sh
new file mode 100755
index 0000000..7640257
--- /dev/null
+++ b/test/tools/run-container.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "docker.io run --name $testContainer $runOptions -d $testImage"
+ID=`docker.io run --name $testContainer $runOptions -d $testImage`
+sleep 7
+
+echo " --> Obtaining IP"
+IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" $ID`
+if [ "$IP" = "" ]; then
+	abort "Unable to obtain container IP"
+	exit 1
+else
+  echo " -->" $IP
+fi
diff --git a/test/tools/run-simple.sh b/test/tools/run-simple.sh
deleted file mode 100755
index 71676be..0000000
--- a/test/tools/run-simple.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-echo "docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage"
-ID=`docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage`
-sleep 5
-
-echo " --> Obtaining IP"
-IP=`docker inspect $ID | grep IPAddress | sed -e 's/.*: "//; s/".*//'`
-if [ "$IP" = "" ]; then
-	abort "Unable to obtain container IP"
-	exit 1
-else
-  echo " -->" $IP
-fi
diff --git a/test/tools/run.sh b/test/tools/run.sh
new file mode 100755
index 0000000..653ccd8
--- /dev/null
+++ b/test/tools/run.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Usage
+# sudo ./test.sh 
+# add -v for verbose mode (or type whatever you like !) :p
+
+verbose=$1
+error=0
+ok=0
+
+echo_start () {
+  echo "------- Test: $* -------"
+}
+
+echo_error () {
+  echo "\n$(tput setaf 1)/!\ $* failed$(tput sgr0)\n"
+  error=`expr $error + 1`
+}
+
+echo_ok () {
+  echo "\n--> $* ok\n"
+  ok=`expr $ok + 1`
+}
+
+run_test () {
+  fction=$1
+  out=test/test.out
+
+  echo_start $fction
+
+  if [ -z ${verbose} ]; then
+    ./test/$1.sh > $out 2>&1
+  else
+    ./test/$1.sh | tee $out 2>&1
+  fi
+  
+  if [ "$(grep -c "$2" $out)" -eq 0 ]; then
+    echo_error $fction
+  else
+    echo_ok  $fction
+  fi
+
+  rm $out
+}
+
+./test/tools/prepare.sh > /dev/null 2>&1

From 940c5afc4fc66c3774ab941355f4486d72bd82c9 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hi-media.com>
Date: Wed, 18 Jun 2014 09:31:50 +0200
Subject: [PATCH 3/5] new tests

---
 test.sh           |  8 ++++----
 test/tools/run.sh | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test.sh b/test.sh
index 06b5bb9..bff84aa 100755
--- a/test.sh
+++ b/test.sh
@@ -6,10 +6,10 @@
 
 . test/tools/run.sh
 
-run_test tools/build-container "Successfully built"
-run_test simple "dn: dc=example,dc=com"
-run_test tls "dn: dc=example,dc=com"
-run_test db "dn: dc=otherdomain,dc=com"
+run_test tools/build-container.sh "Successfully built"
+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/tools/run.sh b/test/tools/run.sh
index 653ccd8..2618eeb 100755
--- a/test/tools/run.sh
+++ b/test/tools/run.sh
@@ -23,21 +23,21 @@ echo_ok () {
 }
 
 run_test () {
-  fction=$1
+  test=$1
   out=test/test.out
 
-  echo_start $fction
+  echo_start $test
 
   if [ -z ${verbose} ]; then
-    ./test/$1.sh > $out 2>&1
+    ./test/$test > $out 2>&1
   else
-    ./test/$1.sh | tee $out 2>&1
+    ./test/$test | tee $out 2>&1
   fi
   
   if [ "$(grep -c "$2" $out)" -eq 0 ]; then
-    echo_error $fction
+    echo_error $test
   else
-    echo_ok  $fction
+    echo_ok  $test
   fi
 
   rm $out

From 223c0405654b4151949739d1c3c034c593e6661a Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hi-media.com>
Date: Wed, 18 Jun 2014 09:32:05 +0200
Subject: [PATCH 4/5] [twgit] Init release 'release-0.7.0'.


From e936973e9c22bc4e83a8f71ea55548ece5b4b74a Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hi-media.com>
Date: Wed, 18 Jun 2014 09:36:08 +0200
Subject: [PATCH 5/5] merge

---
 test/{ => tls}/ssl/ca.crt      | 0
 test/{ => tls}/ssl/dhparam.pem | 0
 test/{ => tls}/ssl/ldap.crt    | 0
 test/{ => tls}/ssl/ldap.key    | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{ => tls}/ssl/ca.crt (100%)
 rename test/{ => tls}/ssl/dhparam.pem (100%)
 rename test/{ => tls}/ssl/ldap.crt (100%)
 rename test/{ => tls}/ssl/ldap.key (100%)

diff --git a/test/ssl/ca.crt b/test/tls/ssl/ca.crt
similarity index 100%
rename from test/ssl/ca.crt
rename to test/tls/ssl/ca.crt
diff --git a/test/ssl/dhparam.pem b/test/tls/ssl/dhparam.pem
similarity index 100%
rename from test/ssl/dhparam.pem
rename to test/tls/ssl/dhparam.pem
diff --git a/test/ssl/ldap.crt b/test/tls/ssl/ldap.crt
similarity index 100%
rename from test/ssl/ldap.crt
rename to test/tls/ssl/ldap.crt
diff --git a/test/ssl/ldap.key b/test/tls/ssl/ldap.key
similarity index 100%
rename from test/ssl/ldap.key
rename to test/tls/ssl/ldap.key