[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-58-gb6c3db5

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Fri Sep 4 16:45:23 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  b6c3db5ad9ba7d9695d473c56004045c9f792aaf (commit)
       via  fa4e18aa31ff0a889e1d05d2d0e208bbffb0f9fe (commit)
       via  8d1eafc5df4c53b03e2808c74849f92660647b13 (commit)
       via  637a7df6919fac4e97e0abca33a2ef16284702e2 (commit)
      from  27a3796fff685b4fea466e8d74ae28b74698eb92 (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=b6c3db5ad9ba7d9695d473c56004045c9f792aaf

commit b6c3db5ad9ba7d9695d473c56004045c9f792aaf
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 4 16:45:10 2015 +0200

    testsuite: move other tests to using fixture

diff --git a/tests/func/20_Docs/createDocURLTest.php b/tests/func/20_Docs/createDocURLTest.php
index 001f7ae..c9cb5a1 100644
--- a/tests/func/20_Docs/createDocURLTest.php
+++ b/tests/func/20_Docs/createDocURLTest.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010-2013 Alain Peyrat - Alcatel-Lucent
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -47,9 +48,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateDocURL extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testCreateDocURL()
 	{
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+
 		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Docs");
 		$this->clickAndWait("addItemDocmanMenu");
@@ -81,7 +86,9 @@ class CreateDocURL extends FForge_SeleniumTestCase
 
 	function testCreateMultipleDocs()
 	{
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+
 		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Docs");
 		$this->clickAndWait("addItemDocmanMenu");
diff --git a/tests/func/20_FRS/FRSTest.php b/tests/func/20_FRS/FRSTest.php
index aa19d6e..37cf886 100644
--- a/tests/func/20_FRS/FRSTest.php
+++ b/tests/func/20_FRS/FRSTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright, 2014, Franck Villaume - TrivialDev
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -23,9 +24,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateFRS extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testCreateFRSPackage()
 	{
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Files");
 		$this->assertFalse($this->isTextPresent("Permission denied."));
 		$this->assertTrue($this->isTextPresent("Administration"));
diff --git a/tests/func/20_Forums/forumsTest.php b/tests/func/20_Forums/forumsTest.php
index b3f7cde..f68fc62 100644
--- a/tests/func/20_Forums/forumsTest.php
+++ b/tests/func/20_Forums/forumsTest.php
@@ -2,6 +2,7 @@
 /**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -46,11 +47,15 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateForum extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testSimplePost()
 	{
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+
 		// Create the first message (Message1/Text1).
-		$this->populateStandardTemplate('forums');
-		$this->init();
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Forums");
 		$this->assertFalse($this->isTextPresent("Permission denied."));
 		$this->assertTrue($this->isTextPresent("open-discussion"));
@@ -80,8 +85,8 @@ class CreateForum extends FForge_SeleniumTestCase
 	 */
 	function testSimpleAccessWhenPrivate()
 	{
-		$this->populateStandardTemplate('forums');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
 
 		$this->open( ROOT.'/forum/message.php?msg_id=6' );
 		$this->waitForPageToLoad("30000");
@@ -103,8 +108,7 @@ class CreateForum extends FForge_SeleniumTestCase
 	 */
 	function testReplyToMessage()
 	{
-		$this->populateStandardTemplate('forums');
-		$this->init();
+		$this->loadAndCacheFixture();
 		$this->logout();
 
 		$this->gotoProject('ProjectA');
@@ -128,8 +132,10 @@ class CreateForum extends FForge_SeleniumTestCase
 	 * Verify that it is impossible to use name already used by a mailing list
 	 */
 	function testEmailAddressNotAlreadyUsed() {
-		$this->populateStandardTemplate('forums');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+
+		$this->gotoProject('ProjectA');
 		$this->click("link=Mailing Lists");
 		$this->waitForPageToLoad("30000");
 		$this->click("//body//div[@id='maindiv']//a[.='Administration']");
@@ -157,8 +163,10 @@ class CreateForum extends FForge_SeleniumTestCase
 	function testHtmlFiltering()
 	{
 		// Create the first message (Message1/Text1).
-		$this->populateStandardTemplate('forums');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Forums");
 		$this->assertFalse($this->isTextPresent("Permission denied."));
 		$this->assertTextPresent("open-discussion");
diff --git a/tests/func/20_News/newsTest.php b/tests/func/20_News/newsTest.php
index 460c7da..a5b1bc1 100644
--- a/tests/func/20_News/newsTest.php
+++ b/tests/func/20_News/newsTest.php
@@ -2,6 +2,7 @@
 /**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -46,10 +47,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateNews extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testMonitorProjectNews()
 	{
-		$this->populateStandardTemplate(array());
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		// Create a simple news.
 		$this->click("link=News");
@@ -124,8 +128,11 @@ class CreateNews extends FForge_SeleniumTestCase
 	 */
 	function testAcBug4100()
 	{
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
+
 		// Create a simple news.
-		$this->init();
 		$this->clickAndWait("link=News");
 		$this->clickAndWait("link=Submit");
 		$this->type("summary", "Multi line news");
@@ -153,7 +160,9 @@ class CreateNews extends FForge_SeleniumTestCase
 	function testPreventMultiplePost()
 	{
 		// Create a simple news.
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		$this->clickAndWait("link=News");
 		$this->clickAndWait("link=Submit");
diff --git a/tests/func/20_Surveys/surveysTest.php b/tests/func/20_Surveys/surveysTest.php
index 5fd5db3..a44f2a6 100644
--- a/tests/func/20_Surveys/surveysTest.php
+++ b/tests/func/20_Surveys/surveysTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2010 Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -45,10 +46,14 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class Surveys extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testSimpleSurvey()
 	{
 		// Test: Create a simple survey.
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		$this->clickAndWait("link=Surveys");
 		$this->clickAndWait("link=Administration");
diff --git a/tests/func/20_Tasks/createTaskTest.php b/tests/func/20_Tasks/createTaskTest.php
index 131200a..b2a45f0 100644
--- a/tests/func/20_Tasks/createTaskTest.php
+++ b/tests/func/20_Tasks/createTaskTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -45,6 +46,8 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateTask extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testcreateTask()
 	{
 		$this->setUpTasks();
@@ -65,10 +68,12 @@ class CreateTask extends FForge_SeleniumTestCase
 		$this->exportCSV();
 	}
 
+
 	function setUpTasks()
 	{
-		$this->populateStandardTemplate(array('tasks'));
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		// Initialize "rep_time_tracking" table
 		$this->click("link=Reporting");
diff --git a/tests/func/20_Trackers/relationTest.php b/tests/func/20_Trackers/relationTest.php
index 7430044..f1e1247 100644
--- a/tests/func/20_Trackers/relationTest.php
+++ b/tests/func/20_Trackers/relationTest.php
@@ -2,6 +2,7 @@
 /**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009-2010 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -46,10 +47,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateTrackerRelation extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testCreateRelation()
 	{
-		$this->populateStandardTemplate('trackers');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		// Testing extra-fields
 		$this->click("link=Tracker");
diff --git a/tests/func/20_Trackers/trackersTest.php b/tests/func/20_Trackers/trackersTest.php
index c47547d..9760bb0 100644
--- a/tests/func/20_Trackers/trackersTest.php
+++ b/tests/func/20_Trackers/trackersTest.php
@@ -2,6 +2,7 @@
 /**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 - 2010 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -46,10 +47,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateTracker extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testSimpleCreate()
 	{
-		$this->populateStandardTemplate('trackers');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		// Test: Create a simple bug report (Message1/Text1).
 		$this->click("link=Tracker");
@@ -123,8 +127,9 @@ class CreateTracker extends FForge_SeleniumTestCase
 
 	function testExtraFields()
 	{
-		$this->populateStandardTemplate('trackers');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		// Testing extra-fields
 		$this->click("link=Tracker");
@@ -173,8 +178,9 @@ class CreateTracker extends FForge_SeleniumTestCase
 
 	function testCreateAndDeleteNewTracker()
 	{
-		$this->populateStandardTemplate('trackers');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		// Create a new tracker and delete it after.
 		$this->click("link=Tracker");
diff --git a/tests/func/20_Trackers/workflowTest.php b/tests/func/20_Trackers/workflowTest.php
index 8607126..2cdbafd 100644
--- a/tests/func/20_Trackers/workflowTest.php
+++ b/tests/func/20_Trackers/workflowTest.php
@@ -2,6 +2,7 @@
 /**
  * Copyright (C) 2008 Alain Peyrat <aljeux at free.fr>
  * Copyright (C) 2009 - 2010 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -46,11 +47,14 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class CreateTrackerWorkflow extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testWorkflow()
 	{
 		// Testing extra-fields
-		$this->populateStandardTemplate('trackers');
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		$this->clickAndWait("link=Tracker");
 		$this->clickAndWait("link=Bugs");
diff --git a/tests/func/30_RBAC/rbacTest.php b/tests/func/30_RBAC/rbacTest.php
index 3b10d58..4606e8d 100644
--- a/tests/func/30_RBAC/rbacTest.php
+++ b/tests/func/30_RBAC/rbacTest.php
@@ -3,6 +3,7 @@
  * Copyright 2010-2011, Roland Mas
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -25,9 +26,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class RBAC extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testAnonymousProjectReadAccess()
 	{
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 
 		$this->click("link=Admin");
 		$this->waitForPageToLoad("30000");
@@ -52,7 +57,8 @@ class RBAC extends FForge_SeleniumTestCase
 
 	function testGlobalRolesAndPermissions()
 	{
-		$this->login(FORGE_ADMIN_USERNAME);
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
 
 		$this->click("link=Site Admin");
 		$this->waitForPageToLoad("30000");
@@ -257,7 +263,7 @@ class RBAC extends FForge_SeleniumTestCase
 
 	function testProjectRolesAndPermissions()
 	{
-		$this->populateStandardTemplate('all');
+		$this->loadAndCacheFixture();
 
 		$this->createUser ("bigboss") ;
 		$this->createUser ("guru") ;
diff --git a/tests/func/30_Search/searchTest.php b/tests/func/30_Search/searchTest.php
index 6d51173..2cd337d 100644
--- a/tests/func/30_Search/searchTest.php
+++ b/tests/func/30_Search/searchTest.php
@@ -2,6 +2,7 @@
 /**
  * Copyright 2011, Roland Mas
  * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -24,14 +25,15 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class Search extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function testSearch()
 	{
+		$this->loadAndCacheFixture();
+
 		/*
 		 * Search for projects
 		 */
-
-		$this->populateStandardTemplate();
-		$this->createProject('projecta');
 		$this->createProject('projectb');
 
 		$this->open(ROOT) ;
@@ -47,25 +49,25 @@ class Search extends FForge_SeleniumTestCase
 		$this->click("//input[@name='Search']");
 		$this->waitForPageToLoad("30000");
 		$this->assertFalse($this->isTextPresent("No matches found for"));
-		$this->assertTrue($this->isTextPresent("public description for projecta"));
+		$this->assertTrue($this->isTextPresent("public description for ProjectA"));
 		$this->assertFalse($this->isTextPresent("public description for projectb"));
 
 		$this->open(ROOT) ;
 		$this->waitForPageToLoad("30000");
-		$this->type("//input[@name='words']", "description public projecta");
+		$this->type("//input[@name='words']", "description public ProjectA");
 		$this->click("//input[@name='Search']");
 		$this->waitForPageToLoad("30000");
 		$this->assertFalse($this->isTextPresent("No matches found for"));
-		$this->assertTrue($this->isTextPresent("public description for projecta"));
+		$this->assertTrue($this->isTextPresent("public description for ProjectA"));
 		$this->assertFalse($this->isTextPresent("public description for projectb"));
 
 		$this->open(ROOT) ;
 		$this->waitForPageToLoad("30000");
-		$this->type("//input[@name='words']", "description 'public projecta'");
+		$this->type("//input[@name='words']", "description 'public ProjectA'");
 		$this->click("//input[@name='Search']");
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("No matches found for"));
-		$this->assertFalse($this->isTextPresent("public description for projecta"));
+		$this->assertFalse($this->isTextPresent("public description for ProjectA"));
 		$this->assertFalse($this->isTextPresent("public description for projectb"));
 
 		$this->open(ROOT) ;
@@ -74,7 +76,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->click("//input[@name='Search']");
 		$this->waitForPageToLoad("30000");
 		$this->assertFalse($this->isTextPresent("No matches found for"));
-		$this->assertTrue($this->isTextPresent("public description for projecta"));
+		$this->assertTrue($this->isTextPresent("public description for ProjectA"));
 		$this->assertTrue($this->isTextPresent("public description for projectb"));
 
 		$this->open(ROOT) ;
@@ -83,7 +85,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->click("//input[@name='Search']");
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("No matches found for"));
-		$this->assertFalse($this->isTextPresent("public description for projecta"));
+		$this->assertFalse($this->isTextPresent("public description for ProjectA"));
 		$this->assertFalse($this->isTextPresent("public description for projectb"));
 
 		$this->open(ROOT) ;
@@ -92,7 +94,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->click("//input[@name='Search']");
 		$this->waitForPageToLoad("30000");
 		$this->assertFalse($this->isTextPresent("No matches found for"));
-		$this->assertTrue($this->isTextPresent("public description for projecta"));
+		$this->assertTrue($this->isTextPresent("public description for ProjectA"));
 		$this->assertTrue($this->isTextPresent("public description for projectb"));
 
 		/*
@@ -148,7 +150,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Prepare some tracker items
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Tracker");
 		$this->clickAndWait("link=Bugs");
 		$this->clickAndWait("link=Submit New");
@@ -227,7 +229,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Create some tasks
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Tasks");
 		$this->clickAndWait("link=To Do");
 		$this->clickAndWait("link=Add Task");
@@ -240,7 +242,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->type("details", 'This is the needle for tasks');
 		$this->clickAndWait("submit");
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Tasks");
 		$this->clickAndWait("link=Next Release");
 		$this->clickAndWait("link=Add Task");
@@ -271,7 +273,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Post some messages in a forum
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Forums");
 		$this->clickAndWait("link=open-discussion");
 		$this->click("link=Start New Thread");
@@ -354,7 +356,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Create some documents
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Docs");
 		$this->clickAndWait("addItemDocmanMenu");
 		// ugly hack until we fix behavior in docman when no folders exist. We need to click twice on the link
@@ -392,7 +394,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Create some news
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=News");
 		$this->clickAndWait("link=Submit");
 		$this->type("summary", "News1 daily planet");
@@ -420,7 +422,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("News1"));
 
 		// Search in entire project
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->select("type_of_search", "label=Search the entire project");
 		$this->type("//input[@name='words']", "needle");
 		$this->clickAndWait("//input[@name='Search']");
@@ -437,7 +439,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertFalse($this->isTextPresent("News1"));
 		$this->assertTrue($this->isTextPresent("News2"));
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->select("type_of_search", "label=Search the entire project");
 		$this->type("//input[@name='words']", "zongo");
 		$this->clickAndWait("//input[@name='Search']");
@@ -456,7 +458,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Advanced search
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait('Link=Advanced search');
 		$this->click("//input[@class='checkthemall']");
 		$this->type("//div[@id='maindiv']//input[@name='words']", "needle");
@@ -474,7 +476,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertFalse($this->isTextPresent("News1"));
 		$this->assertTrue($this->isTextPresent("News2"));
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait('Link=Advanced search');
 		$this->click("//input[@class='checkthemall']");
 		$this->type("//div[@id='maindiv']//input[@name='words']", "zongo");
@@ -494,7 +496,7 @@ class Search extends FForge_SeleniumTestCase
 
 		// Now let's check that RBAC permissions are taken into account
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->click("link=Admin");
 		$this->waitForPageToLoad("30000");
 		$this->click("link=Users and permissions");
@@ -543,7 +545,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->waitForPageToLoad("30000");
 
 		$this->switchUser('ratatouille');
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->select("type_of_search", "label=Search the entire project");
 		$this->type("//input[@name='words']", "zongo");
 		$this->clickAndWait("//input[@name='Search']");
@@ -560,7 +562,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("News1"));
 		$this->assertTrue($this->isTextPresent("News2"));
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait('Link=Advanced search');
 		$this->click("//input[@class='checkthemall']");
 		$this->type("//div[@id='maindiv']//input[@name='words']", "zongo");
@@ -579,7 +581,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("News2"));
 
 		$this->logout();
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->select("type_of_search", "label=Search the entire project");
 		$this->type("//input[@name='words']", "zongo");
 		$this->clickAndWait("//input[@name='Search']");
@@ -596,7 +598,7 @@ class Search extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("News1"));
 		$this->assertTrue($this->isTextPresent("News2"));
 
-		$this->gotoProject('projecta');
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait('Link=Advanced search');
 		$this->click("//input[@class='checkthemall']");
 		$this->assertFalse($this->isElementPresent("//input[@name='short_pm_checkall']"));
diff --git a/tests/func/40_SSH/sshTest.php b/tests/func/40_SSH/sshTest.php
index e6fe449..84ca5f5 100644
--- a/tests/func/40_SSH/sshTest.php
+++ b/tests/func/40_SSH/sshTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2014 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -23,9 +24,13 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class SSHTest extends FForge_SeleniumTestCase
 {
+	// Needs to be member of a project
+	public $fixture = 'projecta';
+
 	function testSSH()
 	{
-		$this->init();
+		$this->loadAndCacheFixture();
+		$this->switchUser(FORGE_ADMIN_USERNAME);
 
 		$this->uploadSshKey();
 
@@ -44,19 +49,4 @@ class SSHTest extends FForge_SeleniumTestCase
 			system("echo 'End of SSH run' 1>&2", $ret);
 		}
 	}
-
-	/**
-	 * Method that is called after Selenium actions.
-	 *
-	 * @param  string $action
-	 */
-	protected function defaultAssertions($action)
-	{
-		if ($action == 'waitForPageToLoad') {
-			$this->assertTrue($this->isElementPresent("//h1")
-					  || $this->isElementPresent("//.[@class='page_footer']"));
-		}
-	}
-
 }
-?>
diff --git a/tests/func/50_PluginsScmBzr/bzrTest.php b/tests/func/50_PluginsScmBzr/bzrTest.php
index f10caec..4922fa3 100644
--- a/tests/func/50_PluginsScmBzr/bzrTest.php
+++ b/tests/func/50_PluginsScmBzr/bzrTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -30,6 +31,7 @@ function mysystem($cmd, &$ret=null) {
 class ScmBzrTest extends FForge_SeleniumTestCase
 {
 	public $fixture = 'projecta';
+
 	function testScmBzr()
 	{
 		$this->skip_on_rpm_installs();
diff --git a/tests/func/50_PluginsScmGit/gitSSHTest.php b/tests/func/50_PluginsScmGit/gitSSHTest.php
index 20483e9..5324846 100644
--- a/tests/func/50_PluginsScmGit/gitSSHTest.php
+++ b/tests/func/50_PluginsScmGit/gitSSHTest.php
@@ -1,6 +1,7 @@
 <?php
 /*
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index f6aa7a2..a8695f4 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php b/tests/func/50_PluginsScmGit/gitWUITest.php
index 66e72d0..4d70a45 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/50_PluginsScmSvn/svnSSHTest.php b/tests/func/50_PluginsScmSvn/svnSSHTest.php
index 5009818..ea563fd 100644
--- a/tests/func/50_PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/50_PluginsScmSvn/svnSSHTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/50_PluginsScmSvn/svnWUITest.php b/tests/func/50_PluginsScmSvn/svnWUITest.php
index 515841c..4cef4fb 100644
--- a/tests/func/50_PluginsScmSvn/svnWUITest.php
+++ b/tests/func/50_PluginsScmSvn/svnWUITest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index df2fd0e..e026c62 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index 91043b1..faf35cb 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -1,6 +1,7 @@
 <?php
 /*
  * Copyright (C) 2012 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/60_PluginsBlocks/blocksTest.php b/tests/func/60_PluginsBlocks/blocksTest.php
index b335323..ee66d8d 100644
--- a/tests/func/60_PluginsBlocks/blocksTest.php
+++ b/tests/func/60_PluginsBlocks/blocksTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2010 Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index 00590ea..c4290b7 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright 2012, Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index 47bb42d..e8673be 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright 2012, Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
index fd89940..4296184 100644
--- a/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
+++ b/tests/func/60_PluginsOnlineHelp/contextualHelpTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2010 Alcatel-Lucent
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
diff --git a/tests/func/70_SOAP/soapTest.php b/tests/func/70_SOAP/soapTest.php
index 89f5922..f492785 100644
--- a/tests/func/70_SOAP/soapTest.php
+++ b/tests/func/70_SOAP/soapTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2014 Roland Mas
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -23,6 +24,8 @@ require_once dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class SoapTest extends FForge_SeleniumTestCase
 {
+	public $fixture = 'projecta';
+
 	function setUp() {
 		parent::setUp();
 
@@ -38,8 +41,7 @@ class SoapTest extends FForge_SeleniumTestCase
 
 	function testSoap()
 	{
-		$this->populateStandardTemplate('trackers');
-		$this->init();
+		$this->loadAndCacheFixture();
 
 		$userid = FORGE_ADMIN_USERNAME;
 		$passwd = FORGE_ADMIN_PASSWORD;
@@ -108,6 +110,8 @@ class SoapTest extends FForge_SeleniumTestCase
 
 		$response = $this->soapclient->addArtifact($this->session, $projecta->group_id, $tracker->group_artifact_id, 1, 3, 100, "Bug submitted by SOAP", "Bug details are not really relevant here", array());
 
+		$this->switchUser(FORGE_ADMIN_USERNAME);
+		$this->gotoProject('ProjectA');
 		$this->clickAndWait("link=Tracker");
 		$this->clickAndWait("link=Bugs");
 		$this->assertTrue($this->isTextPresent("Bug submitted by SOAP"));
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index 888f730..b8f60b5 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2007-2008 Alain Peyrat <aljeux at free dot fr>
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
  *
  * This file is part of FusionForge.
  *
@@ -111,6 +112,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 			passthru("$base_cmd base", $ret); ob_flush();
 
 			require(dirname(dirname(__FILE__))."/fixtures/{$this->fixture}.php");
+			$this->logout();
 			$this->fixture_loaded = true;
 
 			passthru("$base_cmd --backup {$this->fixture}", $ret); ob_flush();
@@ -219,7 +221,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$this->clickAndWait("submit");
 
 		$this->open( ROOT . '/projects/tmpl') ;
-		$this->waitForPageToLoad("30000");
+		$this->waitForPageToLoad();
 
 		$this->clickAndWait("link=Admin");
 		$this->clickAndWait("link=Tools");
@@ -337,7 +339,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 	{
 //		$this->click("link=Log Out");
 		$this->open( ROOT ."/account/logout.php" );
-		$this->waitForPageToLoad("30000");
+		$this->waitForPageToLoad();
 
 		$this->logged_in = false ;
 	}
@@ -391,7 +393,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$this->switchUser ($user) ;
 
 		$this->open( ROOT . '/admin/approve-pending.php') ;
-		$this->waitForPageToLoad("30000");
+		$this->waitForPageToLoad();
 		$this->clickAndWait("document.forms['approve.$unix_name'].submit");
 
 		$this->assertTrue($this->isTextPresent("Approving Project: $unix_name"));
@@ -415,6 +417,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 
 	public function createUser ($login)
 	{
+		$this->switchUser(FORGE_ADMIN_USERNAME);
 		$this->open( ROOT );
 		$this->clickAndWait("link=Site Admin");
 		$this->clickAndWait("link=Register a New User");
@@ -433,9 +436,9 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 	public function activatePlugin($pluginName) {
 		$this->switchUser(FORGE_ADMIN_USERNAME);
 		$this->open( ROOT . '/admin/pluginman.php?update='.$pluginName.'&action=deactivate');
-		$this->waitForPageToLoad("30000");
+		$this->waitForPageToLoad();
 		$this->open( ROOT . '/admin/pluginman.php?update='.$pluginName.'&action=activate');
-		$this->waitForPageToLoad("30000");
+		$this->waitForPageToLoad();
 		//$this->logout();
 	}
 
@@ -443,7 +446,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$unix_name = strtolower($project);
 
 		$this->open( ROOT . '/projects/' . $unix_name) ;
-		$this->waitForPageToLoad("30000");
+		$this->waitForPageToLoad();
 		$this->assertTrue($this->isTextPresent("This is the public description for $project."));
 	}
 

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

commit fa4e18aa31ff0a889e1d05d2d0e208bbffb0f9fe
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 4 15:32:03 2015 +0200

    testsuite: purge fixtures on --reset + restart apache after backup + clean-up

diff --git a/tests/func/db_reload.sh b/tests/func/db_reload.sh
index 0324046..4bf9caf 100755
--- a/tests/func/db_reload.sh
+++ b/tests/func/db_reload.sh
@@ -20,7 +20,6 @@ is_db_down () {
 }
 
 stop_apache () {
-
     echo "Stopping apache"
     service $(forge_get_config apache_service) stop
 }
@@ -54,7 +53,6 @@ stop_database () {
 }
 
 start_database () {
-
     echo "Starting the database"
     service postgresql start
 
@@ -74,7 +72,6 @@ start_database () {
 }
 
 start_apache () {
-
     echo "Starting apache"
     service $(forge_get_config apache_service) start
 }
@@ -100,18 +97,13 @@ else
     fixture='base'
 fi
 
-
-if [ "$exists" = 1 ]; then
-    pgdir=/var/lib/postgresql
-    if [ -e /etc/redhat-release ]; then pgdir=/var/lib/pgsql; fi
-    if [ -d $pgdir.backup-$fixture ]; then
-	exit 0
-    else
-	exit 1
-    fi
+pgdir=/var/lib/postgresql
+if [ -e /etc/redhat-release ]; then pgdir=/var/lib/pgsql; fi
+if [ ! -d $pgdir ]; then
+    echo "Database dir not found"
+    exit 1
 fi
 
-
 database=$(forge_get_config database_name)
 if [ "x$database" = "x" ]
 then
@@ -119,16 +111,28 @@ then
     exit 1
 fi
 
+# Check if requested DB fixture exists
+if [ "$exists" = 1 ]; then
+    if [ -d $pgdir.backup-$fixture ]; then
+	exit 0
+    else
+	exit 1
+    fi
+fi
+
 # Reset the DB to a clean post-install state
 if [ "$reset" = 1 ]; then
     set -e
     # Reset connections
+    stop_apache
     service fusionforge-systasksd stop
     service postgresql restart
     su - postgres -c "dropdb $database" || true
     $(forge_get_config source_path)/post-install.d/db/db.sh configure
     forge_set_password admin myadmin
     service fusionforge-systasksd start
+    start_apache
+    rm -rf $pgdir.backup-*/
     exit 0
 fi
 
@@ -136,30 +140,23 @@ fi
 if [ "$backup" = 1 ]; then
     set -e
     su - postgres -c 'psql -c CHECKPOINT'  # flush to disk
+    stop_apache
     stop_database
-    pgdir=/var/lib/postgresql
-    if [ -e /etc/redhat-release ]; then pgdir=/var/lib/pgsql; fi
     rm -fr $pgdir.backup-$fixture/*
     # support /var/lib/pgsql as a symlink to tmpfs
     mkdir -p $(readlink -f $pgdir.backup-$fixture)
     cp -a --reflink=auto $pgdir/* $pgdir.backup-$fixture/
     start_database
+    start_apache
     exit 0
 fi
 
 
+# Else, restore clean state
+
 stop_apache
 stop_database --force
 
-if [ -d /var/lib/postgresql ] ; then
-    dbdir=/var/lib/postgresql
-elif [ -d /var/lib/pgsql ] ; then
-    dbdir=/var/lib/pgsql
-else
-    echo "Database dir not found"
-    exit 1
-fi
-
 # SCM
 for i in arch bzr cvs darcs git hg svn ; do
     repopath=`FUSIONFORGE_NO_PLUGINS=true forge_get_config repos_path scm$i`
@@ -179,12 +176,11 @@ rm -rf $(forge_get_config groupdir_prefix) #no trailing slash
 # Too risky
 #rm -f ~/.ssh/id_rsa ~/.ssh/id_rsa.pub ~/.ssh/known_hosts
 
-# If the backup is there, restore it (it should now have been created by run-testsuite.sh)
-if [ -d $dbdir.backup-$fixture/ ]; then
-
-    echo "Restore database from files backup ($dbdir.backup-$fixture/)"
-    rm -rf $dbdir/*
-    cp -a --reflink=auto $dbdir.backup-$fixture/* $dbdir/
+# If the backup is there, restore it
+if [ -d $pgdir.backup-$fixture/ ]; then
+    echo "Restore database from files backup ($pgdir.backup-$fixture/)"
+    rm -rf $pgdir/*
+    cp -a --reflink=auto $pgdir.backup-$fixture/* $pgdir/
 
     pg_conf=$(ls /etc/postgresql/*/*/postgresql.conf /var/lib/pgsql/data/postgresql.conf 2>/dev/null | tail -1)
 
@@ -194,16 +190,13 @@ if [ -d $dbdir.backup-$fixture/ ]; then
 	fi
     done
 else
-    echo "Couldn't restore the database: $dbdir.backup-$fixture/ not found"
+    echo "Couldn't restore the database: $pgdir.backup-$fixture/ not found"
     exit 2
 fi
 
 start_database
-
 start_apache
 
-set -x
-
 if [ -x /usr/sbin/nscd ]; then
     echo "Flushing/restarting nscd"
     nscd -i passwd && nscd -i group

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

commit 8d1eafc5df4c53b03e2808c74849f92660647b13
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 4 14:18:34 2015 +0200

    testsuite: properly disable mediawiki for centos only

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 3817fd7..ad67f7d 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -57,6 +57,9 @@ fi
         install-plugin-scmsvn install-plugin-scmgit \
         install-plugin-blocks install-plugin-moinmoin \
         install-plugin-online_help install-plugin-taskboard install-plugin-message
+    if [ -e /etc/debian_version ]; then
+	install-plugin-mediawiki
+    fi
     make post-install
 )
 
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 98b46bb..609d3f4 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -57,7 +57,6 @@ else
 	# Initial installation
 	yum --enablerepo=epel install -y fusionforge fusionforge-shell fusionforge-scm \
 	    fusionforge-plugin-scmgit fusionforge-plugin-scmsvn \
-	    fusionforge-plugin-mediawiki \
 	    fusionforge-plugin-blocks fusionforge-plugin-online_help fusionforge-plugin-taskboard \
 	    fusionforge-plugin-message
     fi

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

commit 637a7df6919fac4e97e0abca33a2ef16284702e2
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 4 14:16:10 2015 +0200

    testsuite: attempt to fix screenshots URL

diff --git a/tests/func/phpunit-selenium.sh b/tests/func/phpunit-selenium.sh
index 5b113c1..a1bb8da 100755
--- a/tests/func/phpunit-selenium.sh
+++ b/tests/func/phpunit-selenium.sh
@@ -51,9 +51,11 @@ FORGE_HOME=$(cd $(dirname $0)/../..; pwd)
 cd $FORGE_HOME
 
 SELENIUM_RC_DIR=/var/log
-SELENIUM_RC_URL=${HUDSON_URL}job/${JOB_NAME}/ws/reports
 SELENIUM_RC_HOST=$HOST
-# the PHP file provided through CONFIG_PHP will be loaded inside the functionnal test suite with require_once, in SeleniumForge.php
+# URL for screenshots - cf. http://buildbot.fusionforge.org/env-vars.html
+SELENIUM_RC_URL=${JOB_URL}/ws/method/${INSTALL_METHOD}/os/${INSTALL_OS}/reports/
+# the PHP file provided through CONFIG_PHP will be loaded inside the
+# functionnal test suite with require_once, in SeleniumForge.php
 CONFIG_PHP=func/config.php
 export SELENIUM_RC_DIR SELENIUM_RC_URL SELENIUM_RC_HOST HOST DB_NAME DB_USER CONFIG_PHP
 

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

Summary of changes:
 autoinstall/install-src.sh                         |  3 ++
 autoinstall/install.sh                             |  1 -
 tests/func/20_Docs/createDocURLTest.php            | 11 +++-
 tests/func/20_FRS/FRSTest.php                      |  7 ++-
 tests/func/20_Forums/forumsTest.php                | 28 ++++++----
 tests/func/20_News/newsTest.php                    | 17 ++++--
 tests/func/20_Surveys/surveysTest.php              |  7 ++-
 tests/func/20_Tasks/createTaskTest.php             |  9 +++-
 tests/func/20_Trackers/relationTest.php            |  8 ++-
 tests/func/20_Trackers/trackersTest.php            | 18 ++++---
 tests/func/20_Trackers/workflowTest.php            |  8 ++-
 tests/func/30_RBAC/rbacTest.php                    | 12 +++--
 tests/func/30_Search/searchTest.php                | 54 ++++++++++---------
 tests/func/40_SSH/sshTest.php                      | 22 +++-----
 tests/func/50_PluginsScmBzr/bzrTest.php            |  2 +
 tests/func/50_PluginsScmGit/gitSSHTest.php         |  1 +
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php   |  1 +
 tests/func/50_PluginsScmGit/gitWUITest.php         |  1 +
 tests/func/50_PluginsScmSvn/svnSSHTest.php         |  1 +
 tests/func/50_PluginsScmSvn/svnWUITest.php         |  1 +
 tests/func/50_PluginsScmSvn/svnWebDAVTest.php      |  1 +
 tests/func/55_PluginsScmMulti/multiSCMTest.php     |  1 +
 tests/func/60_PluginsBlocks/blocksTest.php         |  1 +
 tests/func/60_PluginsMediawiki/mediawikiTest.php   |  1 +
 tests/func/60_PluginsMoinMoin/moinmoinTest.php     |  1 +
 .../60_PluginsOnlineHelp/contextualHelpTest.php    |  1 +
 tests/func/70_SOAP/soapTest.php                    |  8 ++-
 tests/func/Testing/SeleniumForge.php               | 15 +++---
 tests/func/db_reload.sh                            | 61 ++++++++++------------
 tests/func/phpunit-selenium.sh                     |  6 ++-
 30 files changed, 188 insertions(+), 120 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list