[Fusionforge-commits] FusionForge branch 6.0 updated. 5038ad5c5c4eeccee5798fb1665e2fdfc23eccdd

Roland Mas lolando at fusionforge.org
Thu Apr 9 13:31:28 CEST 2015


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  5038ad5c5c4eeccee5798fb1665e2fdfc23eccdd (commit)
      from  4028bca9f2891a01a8ca0215009ae2dfa1499437 (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 5038ad5c5c4eeccee5798fb1665e2fdfc23eccdd
Author: Roland Mas <lolando at debian.org>
Date:   Thu Apr 9 13:30:33 2015 +0200

    Some more retries

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 0556a1f..c3adcc2 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -57,6 +57,9 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		if ($ret >= 120) {
 			system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p", $ret);
 		}
+		if ($ret >= 120) {
+			system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p", $ret);
+		}
 		$this->assertEquals(0, $ret);
 
 		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
@@ -69,6 +72,9 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		if ($ret >= 120) {
 			system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all", $ret);
 		}
+		if ($ret >= 120) {
+			system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all", $ret);
+		}
 		$this->assertEquals(0, $ret);
 
 		// Check that the changes appear in gitweb
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 237ee4b..065d430 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -29,6 +29,9 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 		if ($ret == 124) {	# retry once if we get a timeout
 			system("cd $dir && timeout 15s $command", $ret);
 		}
+		if ($ret == 124) {	# retry once if we get a timeout
+			system("cd $dir && timeout 15s $command", $ret);
+		}
 		ob_flush();
 		$this->assertEquals(0, $ret);
 	}

-----------------------------------------------------------------------

Summary of changes:
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php |    6 ++++++
 tests/func/50_PluginsScmSvn/svnWebDAVTest.php    |    3 +++
 2 files changed, 9 insertions(+)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list