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 e1c11397deabbcc859fb6f50e2402f04b2b54e60 (commit)
via e4a3db02ee74d924992ace41bde66c97a72cab55 (commit)
via 11b7538d59dc3ce30450680269e9f8ce0f3a9d0a (commit)
via d3b6321bbc7a061c750f14a618e180deb844f596 (commit)
via 743f0142ec53fd122587481cab1e1adad6ded7ea (commit)
via 6ba67bfb39595d4f171a60e7430e0fd86ba83b0f (commit)
via c3069760ff5332865c1becd9ef1b3cb972f9f81f (commit)
via b1835ac7a1aee48f000b864a6bd2333890f5cba9 (commit)
from 3640cb08bb65b2f7226e1f51f46cf25f4a30607a (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=e1c11397deabbcc859fb6f50e2402f04b2b54e60
commit e1c11397deabbcc859fb6f50e2402f04b2b54e60
Merge: 3640cb0 e4a3db0
Author: Sylvain Beucler <[email protected]>
Date: Mon Sep 7 15:18:57 2015 +0200
Merge branch '6.0'
diff --cc tests/func/SeleniumForge.php
index 2feabf0,db16b1e..837b305
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@@ -124,21 -124,11 +124,20 @@@ class FForge_SeleniumTestCase extends P
}
- public function changeConfig($text) {
+ public function changeConfig($config) {
- $forge_get_config = RUN_JOB_PATH."/forge_get_config";
- $config_path = rtrim(`$forge_get_config config_path`);
+ $config_path = rtrim(`forge_get_config config_path`);
$classname = get_class($this);
+
+ $contents = "";
+ foreach ($config as $section => $sv) {
+ $contents .= "[$section]\n";
+ foreach ($sv as $variable => $value) {
+ $contents .= "$variable = $value\n";
+ }
+ }
+
file_put_contents("$config_path/config.ini.d/zzz-buildbot-$classname.ini",
- $text);
+ $contents);
}
public function openWithOneRetry($url) {
-----------------------------------------------------------------------
Summary of changes:
autoinstall/common-backports | 14 +-
autoinstall/install-src.sh | 3 -
autoinstall/run-testsuite.sh | 88 ---------
src/plugins/moinmoin/cronjobs/create-wikis.php | 3 +-
tests/README | 2 +
tests/buildbot/{lxc => }/Makefile | 3 -
tests/buildbot/common-functions | 102 +++--------
tests/buildbot/common-vm | 144 ---------------
tests/buildbot/config/default | 13 +-
tests/buildbot/destroy_vm | 5 -
tests/buildbot/fusionforge-build-and-test.sh | 113 ------------
tests/buildbot/fusionforge-func_tests.sh | 192 ++++++++++++++++++++
...orge-unittests.sh => fusionforge-unit_tests.sh} | 4 +-
tests/buildbot/{lxc => }/init-jenkins.sh | 0
tests/buildbot/{lxc => }/lxc-wrapper | 0
tests/buildbot/start_vm | 25 ---
tests/buildbot/stop_vm | 5 -
tests/func/60_PluginsMoinMoin/moinmoinTest.php | 4 -
tests/func/SeleniumForge.php | 13 +-
tests/func/{db_reload.sh => fixtures.sh} | 3 -
tests/func/phpunit-selenium.sh | 151 ----------------
.../func_tests-xvnc.sh | 8 +-
tests/func_tests.php | 4 +-
tests/func_tests.sh | 199 +++++++++++++++++++++
24 files changed, 435 insertions(+), 663 deletions(-)
delete mode 100755 autoinstall/run-testsuite.sh
rename tests/buildbot/{lxc => }/Makefile (92%)
delete mode 100644 tests/buildbot/common-vm
delete mode 100755 tests/buildbot/destroy_vm
delete mode 100755 tests/buildbot/fusionforge-build-and-test.sh
create mode 100755 tests/buildbot/fusionforge-func_tests.sh
rename tests/buildbot/{fusionforge-unittests.sh => fusionforge-unit_tests.sh}
(89%)
rename tests/buildbot/{lxc => }/init-jenkins.sh (100%)
rename tests/buildbot/{lxc => }/lxc-wrapper (100%)
delete mode 100755 tests/buildbot/start_vm
delete mode 100755 tests/buildbot/stop_vm
rename tests/func/{db_reload.sh => fixtures.sh} (99%)
delete mode 100755 tests/func/phpunit-selenium.sh
rename autoinstall/vnc-run-testsuite.sh => tests/func_tests-xvnc.sh (77%)
create mode 100755 tests/func_tests.sh
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
