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 08351c5d4b0b13fda4feb31520af94dcb9bf87de (commit)
from 9ce4ae485feb741afa5dc82b9d4e7b65e1c1668e (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 08351c5d4b0b13fda4feb31520af94dcb9bf87de
Author: Roland Mas <[email protected]>
Date: Thu Apr 9 11:48:38 2015 +0200
Let's retry the open($url) if one fails
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index aa2d1b9..44946bd 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -153,8 +153,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
$this->waitSystasks();
// Try with a different user
- sleep (5); // ugly temporary sleep() to try and understand
random timeouts..
-
$this->open("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/?p=projecta/projecta.git";);
+
$this->openWithOneRetry("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/?p=projecta/projecta.git";);
$this->assertElementPresent("//.[@class='page_footer']");
$this->assertTextNotPresent("projecta.git");
diff --git a/tests/func/Testing/SeleniumForge.php
b/tests/func/Testing/SeleniumForge.php
index 2455cc7..c7c464b 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -85,6 +85,15 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
$text);
}
+ protected function openWithOneRetry($url) {
+ try {
+ $this->open($url);
+ }
+ catch (Exception $e) {
+ $this->open($url);
+ }
+ }
+
/**
* Method that is called after Selenium actions.
*
-----------------------------------------------------------------------
Summary of changes:
tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 3 +--
tests/func/Testing/SeleniumForge.php | 9 +++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
