[Fusionforge-commits] FusionForge branch 6.0 updated. 91e961c43428eb53bba1685548d2ffd0541bbf44

Roland Mas lolando at fusionforge.org
Fri Apr 3 14:56:21 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  91e961c43428eb53bba1685548d2ffd0541bbf44 (commit)
       via  67845c33e3cf2d0e8d0170aa0eada51c822ee866 (commit)
       via  bd9093232fb5d0806359e7cda3a907ae67b5d15f (commit)
      from  d18019362b5ec5973987d39c2ddf6921f606aeee (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 91e961c43428eb53bba1685548d2ffd0541bbf44
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 3 14:52:00 2015 +0200

    Use current infrastructure for scmbzr testsuite

diff --git a/tests/func/50_PluginsScmBzr/bzrTest.php b/tests/func/50_PluginsScmBzr/bzrTest.php
index 9b7d412..f5ad7ec 100644
--- a/tests/func/50_PluginsScmBzr/bzrTest.php
+++ b/tests/func/50_PluginsScmBzr/bzrTest.php
@@ -49,8 +49,7 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->uploadSshKey();
 
 		// Run the cronjob to create repositories
-		$this->cron("scm/create_scm_repos.php");
-		$this->cron("shell/homedirs.php");
+		$this->waitSystasks();
 
 		// Check that the repo is present and Loggerhead shows it (even if empty)
 		$this->open(ROOT);
@@ -62,9 +61,6 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Bazaar Repository");
 		$this->selectFrame("id=scmbzr_iframe");
-		$this->assertTextPresent("Browsing (root)");
-		$this->click("link=projecta");
-		$this->waitForPageToLoad(60000);
 		$this->assertTextPresent("Browsing (root)/projecta");
 		$this->selectFrame("relative=top");
 
@@ -96,17 +92,12 @@ class ScmBzrTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Bazaar Repository");
 		$this->selectFrame("id=scmbzr_iframe");
-		$this->assertTextPresent("Browsing (root)");
-		$this->click("link=projecta");
-		$this->waitForPageToLoad(60000);
 		$this->assertTextPresent("Browsing (root)/projecta");
 		$this->assertTextPresent("trunk");
-		$this->click("link=trunk");
-		$this->waitForPageToLoad(60000);
+		$this->clickAndWait("link=trunk");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextNotPresent("Adding file");
-		$this->click("link=Changes");
-		$this->waitForPageToLoad(60000);
+		$this->clickAndWait("link=Changes");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextPresent("Adding file");
 		$this->selectFrame("relative=top");

commit 67845c33e3cf2d0e8d0170aa0eada51c822ee866
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 3 14:51:33 2015 +0200

    Use correct Unix group name for Bazaar repositories

diff --git a/src/plugins/scmbzr/common/BzrPlugin.class.php b/src/plugins/scmbzr/common/BzrPlugin.class.php
index 2c1cab0..7c13a93 100644
--- a/src/plugins/scmbzr/common/BzrPlugin.class.php
+++ b/src/plugins/scmbzr/common/BzrPlugin.class.php
@@ -183,7 +183,7 @@ over it to the project's administrator.");
 		$project_name = $project->getUnixName();
 
 		$repo = forge_get_config('repos_path', 'scmbzr') . '/' . $project->getUnixName() ;
-		$unix_group = 'scm_' . $project_name ;
+		$unix_group = $project_name.'_scmrw' ;
 
 		$repo_exists = false ;
 		if (is_dir ($repo)) {

commit bd9093232fb5d0806359e7cda3a907ae67b5d15f
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 3 14:51:13 2015 +0200

    Fixed typo

diff --git a/src/common/include/system/pgsql.class.php b/src/common/include/system/pgsql.class.php
index 6cc8c91..5315c52 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -388,7 +388,7 @@ WHERE users.user_id=$3
   AND users.unix_status=$5
   AND groups.status=$6
   AND groups.group_id=$7)',
-						array($this->GIT_ADD_SCMRO,
+						array($this->GID_ADD_SCMRO,
 							  '_scmro',
 							  $user_id,
 							  'A', 'A', 'A',
@@ -414,7 +414,7 @@ WHERE users.user_id=$3
   AND users.unix_status=$5
   AND groups.status=$6
   AND groups.group_id=$7)',
-						array($this->GIT_ADD_SCMRW,
+						array($this->GID_ADD_SCMRW,
 							  '_scmrw',
 							  $user_id,
 							  'A', 'A', 'A',

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

Summary of changes:
 src/common/include/system/pgsql.class.php     |    4 ++--
 src/plugins/scmbzr/common/BzrPlugin.class.php |    2 +-
 tests/func/50_PluginsScmBzr/bzrTest.php       |   15 +++------------
 3 files changed, 6 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list