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, 6.0 has been updated
via a82ce44786c4b53847312af3628198a568865138 (commit)
via 5830b32125b26b43857f904163b1db7e69bcc818 (commit)
via 331eeee98a1c9fd2db43909d20a58bafe65c7de1 (commit)
from 8d4295cc623ff51f45e35dd648ada31885384a5f (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a82ce44786c4b53847312af3628198a568865138
commit a82ce44786c4b53847312af3628198a568865138
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 8 12:06:17 2015 +0200
testsuite: attempt to fix
apache2-not-restarted-but-complaining-about-restarted-postgresql failures
diff --git a/tests/func/fixtures/projecta.php b/tests/func/fixtures/projecta.php
index 60fb227..a8ba637 100644
--- a/tests/func/fixtures/projecta.php
+++ b/tests/func/fixtures/projecta.php
@@ -21,3 +21,7 @@
$this->populateStandardTemplate('all');
$this->createProject('ProjectA');
+
+// wait for Apache to properly reload, as it might interferer with
+// stop/start during fixture backup
+$this->waitSystasks();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5830b32125b26b43857f904163b1db7e69bcc818
commit 5830b32125b26b43857f904163b1db7e69bcc818
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 8 12:04:46 2015 +0200
testsuite: fix screenshot URL
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 55307f5..38e9715 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -114,7 +114,7 @@ FORGE_HOME=$(cd $(dirname $0)/..; pwd)
SELENIUM_RC_DIR=/var/log
SELENIUM_RC_HOST=$HOST
# URL for screenshots - cf. http://buildbot.fusionforge.org/env-vars.html
-SELENIUM_RC_URL=${JOB_URL}/ws/method/${INSTALL_METHOD}/os/${INSTALL_OS}/reports/
+SELENIUM_RC_URL=${JOB_URL}ws/reports
# config.php will be loaded inside the functionnal test suite with
# require_once, in SeleniumForge.php
export SELENIUM_RC_DIR SELENIUM_RC_URL SELENIUM_RC_HOST HOST
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=331eeee98a1c9fd2db43909d20a58bafe65c7de1
commit 331eeee98a1c9fd2db43909d20a58bafe65c7de1
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 8 12:04:19 2015 +0200
vm: fix desktop shortcuts and avoid xfce warning with chmod +x
diff --git a/vm/packer/file/Desktop/build-and-install.desktop
b/vm/packer/file/Desktop/build-and-install.desktop
old mode 100644
new mode 100755
diff --git a/vm/packer/file/Desktop/run-testsuite.desktop
b/vm/packer/file/Desktop/run-testsuite.desktop
old mode 100644
new mode 100755
index c2fec3e..0d27e18
--- a/vm/packer/file/Desktop/run-testsuite.desktop
+++ b/vm/packer/file/Desktop/run-testsuite.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Name=Run functional tests
-Exec=sh -c "/usr/src/fusionforge/tests/func_tests.sh ; echo Press Enter... ;
read i"
+Exec=sh -c "/usr/src/fusionforge/tests/func_tests.sh deb/debian; echo Press
Enter... ; read i"
Terminal=true
Type=Application
-----------------------------------------------------------------------
Summary of changes:
tests/func/fixtures/projecta.php | 4 ++++
tests/func_tests.sh | 2 +-
vm/packer/file/Desktop/build-and-install.desktop | 0
vm/packer/file/Desktop/run-testsuite.desktop | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
mode change 100644 => 100755 vm/packer/file/Desktop/build-and-install.desktop
mode change 100644 => 100755 vm/packer/file/Desktop/run-testsuite.desktop
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
