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-5.3 has been updated
via 2dfdcaa55af4b0605e21f4db63a98a79338161b4 (commit)
from 70bb4293d38d3c228f70df984d93ccc46f0507c0 (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 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:
tests/func/PluginsScmSvn/svnWebDAVTest.php | 5 ++++-
tests/func/Testing/SeleniumGforge.php | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
