[Fusionforge-commits] FusionForge branch GUM updated. b21ade7eb3b5d773ea01e5b8b2336cf09c129a06

Sylvain Beucler beuc-inria at fusionforge.org
Fri Aug 29 15:05:59 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, GUM has been updated
       via  b21ade7eb3b5d773ea01e5b8b2336cf09c129a06 (commit)
      from  0e94100bc91dd189e6b4efa31760413234e5159c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b21ade7eb3b5d773ea01e5b8b2336cf09c129a06
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 29 15:05:53 2014 +0200

    testsuite: increase db restart timeout ("recovering 000000010000000000000001"?) + fix report path

diff --git a/tests/func/db_reload.sh b/tests/func/db_reload.sh
index 5105e1f..2472edf 100755
--- a/tests/func/db_reload.sh
+++ b/tests/func/db_reload.sh
@@ -44,7 +44,7 @@ stop_database () {
 
     echo "Waiting for database to be down..."
     i=0
-    while [ $i -lt 10 ] && is_db_up ; do
+    while [ $i -lt 15 ] && is_db_up ; do
         echo "...not yet ($(date))..."
         i=$(( $i + 1 ))
         sleep 5
diff --git a/tests/func/vncxstartsuite.sh b/tests/func/vncxstartsuite.sh
index bbc7d37..ca9bfec 100755
--- a/tests/func/vncxstartsuite.sh
+++ b/tests/func/vncxstartsuite.sh
@@ -4,11 +4,11 @@
 if ! type vncserver 2>/dev/null
 then
 	echo "Installing vncserver"
-	if type yum /dev/null 2>&1
+	if type yum >/dev/null 2>&1
 	then
 		yum install -y tigervnc-server
 	fi
-	if type apt-get /dev/null 2>&1
+	if type apt-get >/dev/null 2>&1
 	then
 		apt-get -y install vnc4server
 		apt-get -y install xfonts-base
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 5146004..31ad053 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -5,6 +5,7 @@
 set -e
 
 get_config
+prepare_workspace
 
 export HOST=$1
 if [ -z "$HOST" ]; then
@@ -52,7 +53,7 @@ echo "Run phpunit test on $HOST"
 # TESTGLOB=func/50_PluginsScmGit/gitSSHTest.php
 ssh root@$HOST "/usr/src/fusionforge/tests/func/vncxstartsuite.sh /usr/src/fusionforge/tests/scripts/deb/run-testsuite.sh deb/debian" || retcode=$?
 
-rsync -av root@$HOST:/var/log/ ~/reports/
+rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
 
 stop_vm_if_not_keeped -t $VM $@
 exit $retcode
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index fc2e887..40e25a1 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -32,9 +32,7 @@ retcode=0
 echo "Run phpunit test on $HOST in $FORGE_HOME"
 ssh root@$HOST "/usr/src/fusionforge/tests/func/vncxstartsuite.sh /usr/src/fusionforge/tests/scripts/rpm/run-testsuite.sh" || retcode=$?
 
-rsync -av root@$HOST:/var/log/ ~/reports/
+rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
 
-#stop_vm_if_not_keeped -t $VM $@
-#sudo lxc-stop -k -n $HOST
-#sudo lxc-destroy -n $HOST
+stop_vm_if_not_keeped -t $VM $@
 exit $retcode
diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index 4fb5b69..c209f15 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -5,6 +5,7 @@
 set -e
 
 get_config
+prepare_workspace
 
 export HOST=$1
 if [ -z "$HOST" ]; then
@@ -43,7 +44,7 @@ retcode=0
 echo "Run phpunit test on $HOST"
 ssh root@$HOST "/usr/src/fusionforge/tests/func/vncxstartsuite.sh /usr/src/fusionforge/tests/scripts/deb/run-testsuite.sh src/debian" || retcode=$?
 
-rsync -av root@$HOST:/var/log/ ~/reports/
+rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
 
-#stop_vm_if_not_keeped -t $VM $@
+stop_vm_if_not_keeped -t $VM $@
 exit $retcode

-----------------------------------------------------------------------

Summary of changes:
 tests/func/db_reload.sh                             |    2 +-
 tests/func/vncxstartsuite.sh                        |    4 ++--
 tests/scripts/fusionforge-build-and-test-deb.sh     |    3 ++-
 tests/scripts/fusionforge-build-and-test-rpm.sh     |    6 ++----
 tests/scripts/fusionforge-build-and-test-src-deb.sh |    5 +++--
 5 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list