[Fusionforge-commits] FusionForge branch 6.0 updated. e59eda1dd1e006f7572eca027b3e61a79341ecbd

Roland Mas lolando at fusionforge.org
Thu Apr 9 15:11:30 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  e59eda1dd1e006f7572eca027b3e61a79341ecbd (commit)
      from  f371807e6e8816cfbeeeea30c40f44d0561b7bb4 (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 e59eda1dd1e006f7572eca027b3e61a79341ecbd
Author: Roland Mas <lolando at debian.org>
Date:   Thu Apr 9 15:11:23 2015 +0200

    Fixed invocation of timeout to run commands with some environment variable declarations

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index d20f948..470b978 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -52,7 +52,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 
 		// Create a local clone, add stuff, push it to the repo
 		$t = exec("mktemp -d /tmp/gitTest.XXXXXX");
-		$this->runCommandTimeout($t, "GIT_SSL_NO_VERIFY=true git clone --quiet $p");
+		$this->runCommandTimeout($t, "git clone --quiet $p", "GIT_SSL_NO_VERIFY=true");
 
 		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'", $ret);
@@ -60,7 +60,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		system("cd $t/projecta && git commit --quiet -a -m'Modifying file'", $ret);
 		$this->assertEquals(0, $ret);
 
-		$this->runCommandTimeout("$t/projecta", "GIT_SSL_NO_VERIFY=true git push --quiet --all");
+		$this->runCommandTimeout("$t/projecta", "git push --quiet --all", "GIT_SSL_NO_VERIFY=true");
 
 		// Check that the changes appear in gitweb
 		$this->open(ROOT);
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index 87a744e..271c248 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -132,8 +132,8 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		ob_flush();
 	}
 
-	function runCommandTimeout($dir, $command) {
-		$cmd = "cd $dir && timeout 15s $command";
+	function runCommandTimeout($dir, $command, $env='') {
+		$cmd = "cd $dir && $env timeout 15s $command";
 		system($cmd, $ret);
 		if ($ret == 124) {	# retry once if we get a timeout
 			system($cmd, $ret);

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

Summary of changes:
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php |    4 ++--
 tests/func/Testing/SeleniumForge.php             |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list