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

Roland Mas lolando at fusionforge.org
Wed Oct 29 16:29:36 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  5c17e766ff17ce93bac16761424e250c99ff78d0 (commit)
      from  2e27a0c6b80ef053be8524ed478576746cbc1f69 (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 5c17e766ff17ce93bac16761424e250c99ff78d0
Author: Roland Mas <lolando at debian.org>
Date:   Wed Oct 29 16:29:28 2014 +0100

    Added timeouts to Git invocations

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index d8669eb..f67e76b 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -51,19 +51,20 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$p = preg_replace(",^git clone ,", "", $p);
 		$p = preg_replace(",@,", ":".FORGE_ADMIN_PASSWORD."@", $p);
         $log = "2>> /var/log/git.log >> /var/log/git.log";
+        $timeout = "timeout 15s";
 
 		// 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 git clone --quiet $p $log", $ret);
+		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");
-		system("cd $t/projecta && git add mytext.txt && git commit --quiet -a -m'Adding file' $log", $ret);
+		system("cd $t/projecta && $timeout git add mytext.txt $log && $timeout git commit --quiet -a -m'Adding file' $log", $ret);
 		system("echo 'another simple text' >> $t/projecta/mytext.txt");
 		system("cd $t/projecta && git commit --quiet -a -m'Modifying file' $log", $ret);
 		$this->assertEquals($ret, 0);
 
-		system("cd $t/projecta && GIT_SSL_NO_VERIFY=true git push --quiet --all", $ret);
+		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

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

Summary of changes:
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list