Fixup and enable "silverpeas-basics" test

test/config.sh

@@ -172,6 +172,9 @@ imageTests+=(
 		ruby-bundler
 		ruby-nonroot
 	'
+	[silverpeas]='
+		silverpeas-basics
+	'
 	[tomcat]='
 		tomcat-hello-world
 	'

test/tests/silverpeas-basics/run.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -eo pipefail
 
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -7,19 +6,23 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 cname="silverpeas-container-$RANDOM-$RANDOM"
-
 # when running the first time, a silverpeas process is spawn before starting Silverpeas
 # (this configuration process can take some time)
-cid="$(docker run -d -e DB_SERVERTYPE="H2" -e DB_SERVER=":file:" -e DB_PASSWORD="sa" --name "$cname" "$image")"
+cid="$(
+	docker run -d \
+		--name "$cname" \
+		-e DB_SERVERTYPE='H2' \
+		-e DB_SERVER=':file:' \
+		-e DB_PASSWORD='sa' \
+		"$image"
+)"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 check_running() {
-  docker run --rm --link "$cid":silverpeas "$image" wget silverpeas:8000/silverpeas &>/dev/null
-  return $?
+	docker run --rm --link "$cid":silverpeas "$image" wget http://silverpeas:8000/silverpeas -O /dev/null
 }
 
 . "$dir/../../retry.sh" --tries 20 --sleep 5 'check_running'
 
-silverpeas_status="$(docker exec "$cname" /opt/silverpeas/bin/silverpeas status)"
-
-[ "`echo $silverpeas_status`" = "Configured: [OK] Running: [OK] Active: [OK] INFO: JBoss is running" ]
+expected='Configured: [OK] Running:    [OK] Active:     [OK]  INFO: JBoss is running '
+[ "$(docker exec "$cname" /opt/silverpeas/bin/silverpeas status | tr '\n' ' ')" = "$expected" ]