[Fusionforge-commits] FusionForge branch master updated. 14b41ca00a59f52a1729a4df67668cdc994f57fe

Sylvain Beucler beuc-inria at fusionforge.org
Thu Feb 6 16:12:10 CET 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, master has been updated
       via  14b41ca00a59f52a1729a4df67668cdc994f57fe (commit)
       via  15e2cb3d5d080ca41114915529596175ac0fe49b (commit)
      from  fc4457f9a7be342bc8a1e2602493e4c022f8af41 (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 14b41ca00a59f52a1729a4df67668cdc994f57fe
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Feb 6 16:10:58 2014 +0100

    VM: use new testsuite infra

diff --git a/tools/VM-bootstrap/file/Desktop/selenium.desktop b/tools/VM-bootstrap/file/Desktop/selenium.desktop
deleted file mode 100644
index 0783961..0000000
--- a/tools/VM-bootstrap/file/Desktop/selenium.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Selenium
-Exec=make -C /root/fusionforge/3rd-party/selenium
-Terminal=true
-Type=Application
diff --git a/tools/VM-scripts/run-testsuite.sh b/tools/VM-scripts/run-testsuite.sh
index 1287fcb..567a602 100755
--- a/tools/VM-scripts/run-testsuite.sh
+++ b/tools/VM-scripts/run-testsuite.sh
@@ -1,22 +1,27 @@
-#! /bin/sh
+#!/bin/bash
+
+# Selenium dependencies
+aptitude -y install default-jre iceweasel
+
+# Build selenium
+aptitude -y install cowbuilder
+mkdir -p ~/builder/cow/
+DISTROLIST=wheezy /root/fusionforge/tests/scripts/manage-cowbuilder.sh
+
+mkdir -p ~/build/
+aptitude -y install reprepro
+echo -e "Codename: wheezy\nArchitectures: amd64 source\nComponents: main" > ~/build/debian/conf/distributions
+cd /root/fusionforge/3rd-party/selenium
+make
+
 
 # Test dependencies
 aptitude -y install php5-cli phpunit phpunit-selenium
 
-# If available, install the JUnit OSLC provider test suite
-if [ -d src/plugins/oslc/tests ]; then
-    cd /root/fusionforge/src/plugins/oslc/tests
-    ./setup-provider-test.sh
-fi
-
-export CONFIG_PHP=/root/fusionforge/tests/func/config.php.ffsandbox
+## If available, install the JUnit OSLC provider test suite
+#if [ -d src/plugins/oslc/tests ]; then
+#    cd /root/fusionforge/src/plugins/oslc/tests
+#    ./setup-provider-test.sh
+#fi
 
-# Run the phpunit + Selenium functional tests
-cd /root/fusionforge/tests
-if [ "$*" = "" ] ; then
-    phpunit --verbose SeleniumTests.php
-else
-    for i in $* ; do
-	phpunit --verbose $i
-    done
-fi
+/root/fusionforge/tests/scripts/phpunit.sh DEBDebian70Tests.php
diff --git a/tools/VM-scripts/start-selenium.sh b/tools/VM-scripts/start-selenium.sh
deleted file mode 100755
index a3a824a..0000000
--- a/tools/VM-scripts/start-selenium.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Authors :
-#  Roland Mas
-#  Olivier BERGER <olivier.berger at it-sudparis.eu>
-
-# This script will start the Selenium server which will execute the tests on the installed forge
-
-# Prerequisite : having run 'install.sh' and its prerequisites
-
-# Note that there may be problems with the firefox profile and SSL
-# certificate.  Refer to
-# https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Virtual_machine_development_environment
-# to find instructions to workaround these.
-
-echo
-echo "You may wish to install a graphical environment (gnome, kde, lxde, ...) to run the selenium server inside the VM's display."
-echo
-
-# Test dependencies
-aptitude -y install default-jre iceweasel
-
-cd /root/fusionforge/3rd-party/selenium
-make

commit 15e2cb3d5d080ca41114915529596175ac0fe49b
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Feb 6 14:34:30 2014 +0100

    VM: no need to update the system during bootstrap, already latest version of bzr and packages

diff --git a/tools/VM-bootstrap/scripts/fusionforge-source.sh b/tools/VM-bootstrap/scripts/fusionforge-source.sh
index 38bbfd4..e6afa28 100644
--- a/tools/VM-bootstrap/scripts/fusionforge-source.sh
+++ b/tools/VM-bootstrap/scripts/fusionforge-source.sh
@@ -18,7 +18,3 @@ chown -R root: /root/Desktop
 apt-get -y --force-yes install bzr
 cd /root/
 bzr checkout https://fusionforge.org/anonscm/bzr/deb-packaging/master fusionforge
-
-# Update system
-# Not done here, it makes the .box too big (1.5GB)
-# yes | /root/fusionforge/tools/VM-scripts/update.sh

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

Summary of changes:
 tools/VM-bootstrap/file/Desktop/selenium.desktop |    6 ----
 tools/VM-bootstrap/scripts/fusionforge-source.sh |    4 ---
 tools/VM-scripts/run-testsuite.sh                |   39 ++++++++++++----------
 tools/VM-scripts/start-selenium.sh               |   24 -------------
 4 files changed, 22 insertions(+), 51 deletions(-)
 delete mode 100644 tools/VM-bootstrap/file/Desktop/selenium.desktop
 delete mode 100755 tools/VM-scripts/start-selenium.sh


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list