[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. f535c90ace97015491617a855bfb5ac1b57301e9

Roland Mas lolando at fusionforge.org
Mon Dec 8 15:41:03 CET 2014


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  f535c90ace97015491617a855bfb5ac1b57301e9 (commit)
      from  9b2b83c86c4416e4a6b9f296e5ae2b470b2d8df9 (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 f535c90ace97015491617a855bfb5ac1b57301e9
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 8 15:40:57 2014 +0100

    Retry Git/SVN commands over HTTP if they timeout at first

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 6a1518d..60ca355 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -59,6 +59,9 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		// Create a local clone, add stuff, push it to the repo
 		$t = exec("mktemp -d /tmp/gitTest.XXXXXX");
 		system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p $log", $ret);
+        if ($ret >= 120) {
+            system("cd $t && GIT_SSL_NO_VERIFY=true $timeout git clone --quiet $p $log", $ret);
+        }
 		$this->assertEquals($ret, 0);
 
 		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
@@ -68,6 +71,9 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->assertEquals($ret, 0);
 
 		system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all $log", $ret);
+        if ($ret >= 120) {
+            system("cd $t/projecta && GIT_SSL_NO_VERIFY=true $timeout git push --quiet --all $log", $ret);
+        }
 		$this->assertEquals($ret, 0);
 
 		// Check that the changes appear in gitweb
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index aaa2044..5d1115e 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -59,14 +59,23 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
         $log = "2> /var/log/svn.stderr > /var/log/svn.stdout";
         $timeout = "timeout 15s";
 		system("cd $t && $timeout svn checkout $globalopts $auth $p projecta $log", $ret);
+        if ($ret > 120) {
+            system("cd $t && $timeout svn checkout $globalopts $auth $p projecta $log", $ret);
+        }
 		$this->assertEquals($ret, 0);
 		sleep(2);
 		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
 		system("cd $t/projecta && $timeout svn add mytext.txt $log && $timeout svn commit $globalopts $auth -m'Adding file' $log", $ret);
+        if ($ret > 120) {
+            system("cd $t/projecta && $timeout svn add mytext.txt $log && $timeout svn commit $globalopts $auth -m'Adding file' $log", $ret);
+        }
 		$this->assertEquals($ret, 0);
 		sleep(2);
 		system("echo 'another simple text' >> $t/projecta/mytext.txt");
 		system("cd $t/projecta && $timeout svn commit $globalopts $auth -m'Modifying file' $log", $ret);
+        if ($ret > 120) {
+            system("cd $t/projecta && $timeout svn commit $globalopts $auth -m'Modifying file' $log", $ret);
+        }
 		$this->assertEquals($ret, 0);
 		sleep(2);
 

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

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


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list