[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1141-gaf6e96a

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Nov 10 20:28:01 CET 2016


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, master has been updated
       via  af6e96af1c69adf5e169f62e2af0718fd73737d2 (commit)
       via  0dbbc97492c9795902e94aeea16af38a7da3f413 (commit)
      from  08826d562e8daa8d700a23386c429d0b79857d72 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=af6e96af1c69adf5e169f62e2af0718fd73737d2

commit af6e96af1c69adf5e169f62e2af0718fd73737d2
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Nov 10 20:27:38 2016 +0100

    add more time wait

diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index 3bc780d..7c12922 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -46,6 +46,7 @@ class PluginMoinMoin extends FForge_SeleniumTestCase
 		$this->pause("10000"); //wait for cronjob to be executed
 
 		$this->gotoProject('ProjectA');
+		$this->pause("10000"); //more wait ???
 		$this->clickAndWait("link=MoinMoinWiki");
 		$this->assertFalse($this->isTextPresent("ConfigurationError"));
 		$this->assertFalse($this->isTextPresent("Wiki not created yet"));

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0dbbc97492c9795902e94aeea16af38a7da3f413

commit 0dbbc97492c9795902e94aeea16af38a7da3f413
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Nov 10 20:27:20 2016 +0100

    tab vs. space

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index b3df4cf..3f9d061 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -41,7 +41,7 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=Source Code Admin");
 		$this->click("//input[@name='scmengine[]' and @value='scmgit']");
 		$this->clickAndWait("submit");
-	    
+
 		// Create repositories
 		$this->waitSystasks();
 
@@ -78,15 +78,15 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->assertTextPresent("Adding file");
 		$this->selectFrame("relative=top");
 
-        // Check gitweb directly
-        $this->openWithOneRetry("http://scm.".HOST.ROOT."/anonscm/gitweb/?p=projecta/projecta.git");
+		// Check gitweb directly
+		$this->openWithOneRetry("http://scm.".HOST.ROOT."/anonscm/gitweb/?p=projecta/projecta.git");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
 		$this->clickAndWait("link=projecta.git");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextPresent("Adding file");
 
-        // Disable anonymous access to gitweb
+		// Disable anonymous access to gitweb
 		$this->openWithOneRetry(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->click("link=Admin");
@@ -102,13 +102,13 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		// Update repositories
 		$this->waitSystasks();
 
-        // Check that gitweb now fails
-        $this->openWithOneRetry("http://scm.".HOST.ROOT."/anonscm/gitweb/?p=projecta/projecta.git");
+		// Check that gitweb now fails
+		$this->openWithOneRetry("http://scm.".HOST.ROOT."/anonscm/gitweb/?p=projecta/projecta.git");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextNotPresent("projecta.git");
 
-        // Now try to use the authenticated gitweb
-        $this->openWithOneRetry("http://".FORGE_ADMIN_USERNAME.":".FORGE_ADMIN_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/?p=projecta/projecta.git");
+		// Now try to use the authenticated gitweb
+		$this->openWithOneRetry("http://".FORGE_ADMIN_USERNAME.":".FORGE_ADMIN_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/?p=projecta/projecta.git");
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextPresent("projecta.git");
 
@@ -125,9 +125,9 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->assertTextPresent("Adding file");
 		$this->selectFrame("relative=top");
 
-        // Set up a different user
-        $this->createUser ('otheruser') ;
-        $this->createAndGoto ('projectb');
+		// Set up a different user
+		$this->createUser ('otheruser') ;
+		$this->createAndGoto ('projectb');
 		$this->clickAndWait("link=Admin");
 		$this->clickAndWait("link=Users and permissions");
 		$this->type ("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and @type='text']", "otheruser") ;
@@ -151,15 +151,15 @@ class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 		$this->assertElementPresent("//.[@class='page_footer']");
 		$this->assertTextNotPresent("projecta.git");
 
-        // Test accessing admin's URL with otheruser's credentials (and asserting we get a 401)
-        // …Selenium doesn't allow checking HTTP return codes, so use a file_get_contents() hack
-        // First make sure that the hack works
-        $f = @file_get_contents("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/", "r");
-        $this->assertTrue(is_string($f));
-        $this->assertEquals(1, preg_match('/projectb.git/',$f));
-        // Then make sure we detect a failure
-        $f = @file_get_contents("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/projecta/", "r");
-        $this->assertFalse($f);
+		// Test accessing admin's URL with otheruser's credentials (and asserting we get a 401)
+		// …Selenium doesn't allow checking HTTP return codes, so use a file_get_contents() hack
+		// First make sure that the hack works
+		$f = @file_get_contents("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/otheruser/gitweb/", "r");
+		$this->assertTrue(is_string($f));
+		$this->assertEquals(1, preg_match('/projectb.git/',$f));
+		// Then make sure we detect a failure
+		$f = @file_get_contents("http://otheruser:".FORGE_OTHER_PASSWORD."@scm.".HOST.ROOT."/authscm/".FORGE_ADMIN_USERNAME."/gitweb/projecta/", "r");
+		$this->assertFalse($f);
 
 		system("rm -fr $t");
 	}

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

Summary of changes:
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php | 40 ++++++++++++------------
 tests/func/60_PluginsMoinMoin/moinmoinTest.php   |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list