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 228cee058c93b41a5f56e98651e110de9bab9c92 (commit)
via b42ac36030b81be952303da734ffd7c8647af822 (commit)
via 8f8ae0edcdd668603ffa08c631c2fc7115685156 (commit)
via 1674217917d9e80b559dfa566386a81a046940ed (commit)
via d4d9992977e9c57b390814e138144906f3244214 (commit)
via b6c3db5ad9ba7d9695d473c56004045c9f792aaf (commit)
via fa4e18aa31ff0a889e1d05d2d0e208bbffb0f9fe (commit)
via 8d1eafc5df4c53b03e2808c74849f92660647b13 (commit)
via 637a7df6919fac4e97e0abca33a2ef16284702e2 (commit)
via 27a3796fff685b4fea466e8d74ae28b74698eb92 (commit)
via 5aed90bb3165c1ee18832239a0db13b3e7f8e9f7 (commit)
via a445f9b56499e94acba1599a92a84f1a3ee747d2 (commit)
via 337381df8c706be0dc3ab1cd2ed92062b47e1a6a (commit)
via d88b99d756d4094ac6d0a68bb6f729dca3ebac8b (commit)
via 300158ba2e380ac16ce445f208f2814298a6ab8e (commit)
via 74c8d5eafb58369ece86350d2f49f6b74cc41614 (commit)
from 1ab56f147ecefeb43332ea0ba9dd9d90fb0f5d5f (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=228cee058c93b41a5f56e98651e110de9bab9c92
commit 228cee058c93b41a5f56e98651e110de9bab9c92
Merge: 1ab56f1 b42ac36
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 18:11:40 2015 +0200
Merge branch '6.0'
diff --cc tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index ea4698a,8b1265c..b3df4cf
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@@ -23,13 -24,15 +24,15 @@@ require_once dirname(dirname(__FILE__))
class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmGitSmartHTTP()
{
+ $this->loadAndCacheFixture();
+
- $this->changeConfig("[core]\nuse_ssl = no\n");
+ $this->changeConfig(array("core" => array("use_ssl" => "no")));
$this->activatePlugin('scmgit');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --cc tests/func/50_PluginsScmSvn/svnSSHTest.php
index 63bf818,8ccf05a..42b825d
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@@ -23,14 -24,15 +24,16 @@@ require_once dirname(dirname(__FILE__))
class ScmSvnSSHTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmSvnSSH()
{
- $this->changeConfig("[scmsvn]\nuse_ssh = yes\nuse_dav = no\n");
+ $this->changeConfig(array("scmsvn" => array("use_ssh" => "yes",
+ "use_dav" =>
"no")));
+ $this->loadAndCacheFixture();
+
$this->activatePlugin('scmsvn');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --cc tests/func/50_PluginsScmSvn/svnWUITest.php
index 7fd928f,b6bac36..ee44700
--- a/tests/func/50_PluginsScmSvn/svnWUITest.php
+++ b/tests/func/50_PluginsScmSvn/svnWUITest.php
@@@ -23,14 -24,15 +24,16 @@@ require_once dirname(dirname(__FILE__))
class ScmSvnWUITest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmSvnWUI()
{
+ $this->loadAndCacheFixture();
+
- $this->changeConfig("[scmsvn]\nuse_ssh = no\nuse_dav = yes\n");
+ $this->changeConfig(array("scmsvn" => array("use_ssh" => "no",
+ "use_dav" =>
"yes")));
$this->activatePlugin('scmsvn');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --cc tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 3cc2c78,9fc8c66..39c5850
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@@ -23,13 -24,15 +24,15 @@@ require_once dirname(dirname(__FILE__))
class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
{
+ public $fixture = 'projecta';
+
function testScmSvnWebDAV()
{
+ $this->loadAndCacheFixture();
+
- $this->changeConfig("[scmsvn]\nuse_ssl = no\n");
+ $this->changeConfig(array("scmsvn" => array("use_ssl" =>
"no")));
$this->activatePlugin('scmsvn');
- $this->populateStandardTemplate('empty');
- $this->init();
$this->open(ROOT);
$this->clickAndWait("link=ProjectA");
diff --cc tests/func/55_PluginsScmMulti/multiSCMTest.php
index ab9a081,88bb130..916f20a
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@@ -28,7 -31,9 +31,9 @@@ class multiSCMTest extends FForge_Selen
$this->skip_on_rpm_installs();
$this->skip_on_src_installs();
+ $this->loadAndCacheFixture();
+
- $this->changeConfig("[core]\nallow_multiple_scm = yes\n");
+ $this->changeConfig(array("core" => array("allow_multiple_scm"
=> "yes")));
$this->activatePlugin('scmsvn');
$this->activatePlugin('scmgit');
diff --cc tests/func/60_PluginsMediawiki/mediawikiTest.php
index 1a94e7b,fd9b258..1f3613c
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@@ -30,7 -32,9 +32,9 @@@ class PluginMediawiki extends FForge_Se
$this->skip_on_rpm_installs();
$this->skip_on_centos();
+ $this->loadAndCacheFixture();
+
- $this->changeConfig("[mediawiki]\nunbreak_frames=yes\n");
+ $this->changeConfig(array("mediawiki" => array("unbreak_frames"
=> "yes")));
$this->activatePlugin('mediawiki');
diff --cc tests/func/60_PluginsMoinMoin/moinmoinTest.php
index 57bbd7d,266e1c9..006f16e
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@@ -30,7 -32,9 +32,9 @@@ class PluginMoinMoin extends FForge_Sel
$this->skip_on_rpm_installs();
$this->skip_on_centos();
+ $this->loadAndCacheFixture();
+
- $this->changeConfig("[moinmoin]\nuse_frame=no\n");
+ $this->changeConfig(array("moinmoin" => array("use_frame" =>
"no")));
$this->activatePlugin('moinmoin');
diff --cc tests/func/SeleniumForge.php
index 3cebd2c,6bece12..c27c512
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@@ -81,20 -128,11 +128,20 @@@ class FForge_SeleniumTestCase extends P
$forge_get_config = RUN_JOB_PATH."/forge_get_config";
$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);
}
- protected function openWithOneRetry($url) {
+ public function openWithOneRetry($url) {
try {
$this->open($url);
}
-----------------------------------------------------------------------
Summary of changes:
autoinstall/common-backports | 40 ++---
autoinstall/install-src.sh | 6 +-
autoinstall/install.sh | 1 -
tests/buildbot/common-functions | 50 ------
tests/buildbot/common-vm | 2 +-
tests/buildbot/config/default | 61 +-------
tests/func/10_Site/loginTest.php | 2 +-
tests/func/10_Site/projectsTest.php | 2 +-
tests/func/10_Site/topTest.php | 2 +-
tests/func/10_Site/troveTest.php | 2 +-
tests/func/20_Docs/createDocURLTest.php | 13 +-
tests/func/20_FRS/FRSTest.php | 9 +-
tests/func/20_Forums/forumsTest.php | 30 ++--
tests/func/20_News/newsTest.php | 19 ++-
tests/func/20_Surveys/surveysTest.php | 9 +-
tests/func/20_Tasks/createTaskTest.php | 11 +-
tests/func/20_Trackers/relationTest.php | 10 +-
tests/func/20_Trackers/trackersTest.php | 20 ++-
tests/func/20_Trackers/workflowTest.php | 10 +-
tests/func/30_RBAC/rbacTest.php | 14 +-
tests/func/30_Search/searchTest.php | 56 +++----
tests/func/40_SSH/sshTest.php | 24 +--
tests/func/50_PluginsScmBzr/bzrTest.php | 9 +-
tests/func/50_PluginsScmGit/gitSSHTest.php | 24 +--
tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 24 +--
tests/func/50_PluginsScmGit/gitWUITest.php | 24 +--
tests/func/50_PluginsScmSvn/svnSSHTest.php | 24 +--
tests/func/50_PluginsScmSvn/svnWUITest.php | 24 +--
tests/func/50_PluginsScmSvn/svnWebDAVTest.php | 28 +---
tests/func/55_PluginsScmMulti/multiSCMTest.php | 24 +--
tests/func/60_PluginsBlocks/blocksTest.php | 9 +-
tests/func/60_PluginsMediawiki/mediawikiTest.php | 10 +-
tests/func/60_PluginsMessage/messageTest.php | 26 +---
tests/func/60_PluginsMoinMoin/moinmoinTest.php | 23 +--
.../60_PluginsOnlineHelp/contextualHelpTest.php | 8 +-
tests/func/70_SOAP/soapTest.php | 10 +-
tests/func/{Testing => }/SeleniumForge.php | 173 ++++++++++++---------
tests/func/Testing/SeleniumRemoteSuite.php | 34 ----
tests/func/config.php.buildbot | 54 -------
tests/func/config.php.ffsandbox | 52 -------
tests/func/config.php.sample | 48 ------
tests/func/config.php.tests | 33 ----
tests/func/db_reload.sh | 113 ++++++--------
.../func/fixtures/projecta.php | 11 +-
tests/func/phpunit-selenium.sh | 34 +---
tests/func_tests.php | 5 +-
46 files changed, 409 insertions(+), 808 deletions(-)
rename tests/func/{Testing => }/SeleniumForge.php (79%)
delete mode 100644 tests/func/Testing/SeleniumRemoteSuite.php
delete mode 100644 tests/func/config.php.buildbot
delete mode 100644 tests/func/config.php.ffsandbox
delete mode 100644 tests/func/config.php.sample
delete mode 100644 tests/func/config.php.tests
copy src/plugins/taskboard/common/taskboard-init.php =>
tests/func/fixtures/projecta.php (75%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
