[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-32-gba14d85

[Sylvain Beucler]

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  ba14d851a1a30ee0390f9f2577b303769883d8a4 (commit)
      from  bded8e874e35c60aa1a7a620fb7f4e31f72841e1 (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=ba14d851a1a30ee0390f9f2577b303769883d8a4

commit ba14d851a1a30ee0390f9f2577b303769883d8a4
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Nov 12 16:52:05 2015 +0100

    testsuite: one more libnss-pgsql2 work-around

diff --git a/tests/func/40_SSH/sshTest.php b/tests/func/40_SSH/sshTest.php
index e24e462..f1c400c 100644
--- a/tests/func/40_SSH/sshTest.php
+++ b/tests/func/40_SSH/sshTest.php
@@ -43,7 +43,9 @@ class SSHTest extends FForge_SeleniumTestCase
 			system("echo 'Trying SSH' 1>&2", $ret);
 			$v = "-v";
 		}
-		system("ssh $v ".FORGE_ADMIN_USERNAME."@".HOST." id", $ret);
+		// Using 'PGPASSFILE= <command>' work-around to avoid random stalling
+		// Cf. https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/User_accounts#nscd
+		system("ssh $v ".FORGE_ADMIN_USERNAME."@".HOST." PGPASSFILE= id", $ret);
 		$this->assertEquals(0, $ret);
 		if ($verbose) {
 			system("echo 'End of SSH run' 1>&2", $ret);

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

Summary of changes:
 tests/func/40_SSH/sshTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge