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, feature/concurrent-ssh-http-for-scm has been updated
via 9f53fc4ec2db07bc4eeb54862020c68f838b4122 (commit)
via b948ed65a1c21d9521261658d957c5077eb3ceb4 (commit)
via 2b763fc6434c082f7ffa65d239f18a971d044b8a (commit)
via 20e3461287450ef201dd8c477b875ef25e27d484 (commit)
via 7ca9e4fb23165fe711f0e1c0afb95997465d84e2 (commit)
via dbcf1187bf3a9ac1169bbdd482c446f453ade234 (commit)
via d52391ae3c16db6da3261ae1b6a4fdc7f0440acc (commit)
via ddbc7b2c4b7dba0e4f950813d0ca11424412337c (commit)
via e999630a514d116f7d1439110ab68c357c6aa3ee (commit)
via 2dfdcaa55af4b0605e21f4db63a98a79338161b4 (commit)
via 6a226c5bc2b01f718b41ed27364b09a363bc266d (commit)
via bb99f90fd657496f59c5268379b49d596821afac (commit)
from ba95d6f20234517e37cac16408428c796e6c10da (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 9f53fc4ec2db07bc4eeb54862020c68f838b4122
Merge: b948ed6 20e3461
Author: Roland Mas <[email protected]>
Date: Wed May 28 17:58:47 2014 +0200
Merge branch 'feature/concurrent-ssh-http-for-scm-5.3' into
feature/concurrent-ssh-http-for-scm
commit b948ed65a1c21d9521261658d957c5077eb3ceb4
Merge: ba95d6f 2b763fc
Author: Roland Mas <[email protected]>
Date: Wed May 28 17:58:40 2014 +0200
Merge branch 'master' into feature/concurrent-ssh-http-for-scm
commit 2b763fc6434c082f7ffa65d239f18a971d044b8a
Merge: 6a226c5 7ca9e4f
Author: Roland Mas <[email protected]>
Date: Wed May 28 17:58:23 2014 +0200
Merge branch 'Branch_5_3'
commit 20e3461287450ef201dd8c477b875ef25e27d484
Merge: 2dfdcaa 7ca9e4f
Author: Roland Mas <[email protected]>
Date: Wed May 28 17:51:42 2014 +0200
Merge branch 'Branch_5_3' into feature/concurrent-ssh-http-for-scm-5.3
commit 2dfdcaa55af4b0605e21f4db63a98a79338161b4
Author: Roland Mas <[email protected]>
Date: Wed May 28 15:53:26 2014 +0200
Give things some time to happen (especially for service restarts)
diff --git a/tests/func/PluginsScmSvn/svnWebDAVTest.php
b/tests/func/PluginsScmSvn/svnWebDAVTest.php
index b88373c..52c5329 100644
--- a/tests/func/PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/PluginsScmSvn/svnWebDAVTest.php
@@ -55,12 +55,15 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
$auth = "--username ".FORGE_ADMIN_USERNAME." --password
".FORGE_ADMIN_PASSWORD;
system("cd $t && svn checkout $auth $p projecta", $ret);
$this->assertEquals($ret, 0);
-
+ sleep(2);
system("echo 'this is a simple text' > $t/projecta/mytext.txt");
system("cd $t/projecta && svn add mytext.txt && svn commit
$auth -m'Adding file'", $ret);
+ $this->assertEquals($ret, 0);
+ sleep(2);
system("echo 'another simple text' >> $t/projecta/mytext.txt");
system("cd $t/projecta && svn commit $auth -m'Modifying file'",
$ret);
$this->assertEquals($ret, 0);
+ sleep(2);
// Check that the changes appear in svnweb
$this->open(ROOT);
diff --git a/tests/func/Testing/SeleniumGforge.php
b/tests/func/Testing/SeleniumGforge.php
index 53ac75e..582e002 100644
--- a/tests/func/Testing/SeleniumGforge.php
+++ b/tests/func/Testing/SeleniumGforge.php
@@ -125,13 +125,13 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
protected function reload_apache()
{
$this->runCommand("service apache2 reload > /dev/null 2>&1 ||
service httpd reload > /dev/null 2>&1");
- sleep (3); // Give it some time to become available again
+ sleep (5); // Give it some time to become available again
}
protected function reload_nscd()
{
$this->runCommand("service unscd restart > /dev/null 2>&1 ||
service nscd restart > /dev/null 2>&1 || true");
- sleep (1); // Give it some time to wake up
+ sleep (5); // Give it some time to wake up
}
protected function init() {
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
src/CHANGES | 1 +
src/common/tracker/ArtifactFile.class.php | 8 -
.../mediawiki/packaging/install/plugin-mediawiki | 2 +-
src/utils/manage-apache-config.sh | 6 +-
.../jquery-teamwork-gantt/libs/jquery.livequery.js | 250 ++++++++++++++++++++
tests/func/50_PluginsScmSvn/svnWebDAVTest.php | 5 +-
tests/func/Testing/SeleniumGforge.php | 4 +-
tests/scripts/phpunit.sh | 2 +-
9 files changed, 265 insertions(+), 14 deletions(-)
create mode 100644 src/vendor/jquery-teamwork-gantt/libs/jquery.livequery.js
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
