[Fusionforge-commits] FusionForge branch master updated. b57bbfd34b27ac099ebabd8fea0b1ebf018ba908

Sylvain Beucler beuc-inria at fusionforge.org
Fri Jan 16 14:39:50 CET 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, master has been updated
       via  b57bbfd34b27ac099ebabd8fea0b1ebf018ba908 (commit)
       via  9c861e20d4c85d27f370795b831117522af01181 (commit)
       via  9333b29ee6c24c71e3bd57824fbe2151275a7e18 (commit)
       via  67214428bf6149e2f2b9af83700834e946c27f7f (commit)
       via  932a60f7d09a191d11bbac4718f95d5058d815a3 (commit)
       via  0a2a759114caac98fcf8cef66e5d90c791c3eb38 (commit)
       via  9b81a9a7f4cb84d7c53265de05d7f3a24a0d5f76 (commit)
       via  5d18aa27fe8fb418662fa43b68a703827ece6d1a (commit)
       via  12444679b4266dcf6e7f4478b9352070fa670a91 (commit)
       via  f2f017021a11b36bf76e428bf392f0eaa3af286c (commit)
       via  6a1a41148f82bc1ba5e580bdd49b1d84349cc15a (commit)
       via  b0efab48f25aca2296f4bff7744c67c8774a43bb (commit)
       via  85cf6b3841a081b8d1852763c21d10ba213c2e33 (commit)
       via  0ee8beba8b59818785a944fc6463d1804648b8c0 (commit)
       via  78f58b788c55313a20da5bc19fcb8918a218cc6b (commit)
       via  5df157d3fc147e14c4f2d66b549e67f57b27d363 (commit)
       via  213371833c94f430f2ce54b809eebe6ae185a547 (commit)
       via  25641d9741e877728e94ada495e6eb330164955c (commit)
       via  f5f7313c4d5d2379404c056fd6983935dcbb614f (commit)
       via  b4d0278d7498e3b5fee4548b38b2c002456955d9 (commit)
       via  d5fae1e53ab2882ecb9a510a2bbc3ff0409e9959 (commit)
       via  5299ba3dbe24edd7d677fcc124b3cb1611884503 (commit)
       via  8959bf118ea33c116e851d65e30fcb1505b9daa6 (commit)
       via  0e3286fd1d379f4ff195f988645149cd9ac4d330 (commit)
       via  c826f7dc0a4e16f0c529d8d5b0a91e9e61edd329 (commit)
       via  62965828d192d3398b82d663b2cfad317fe8ceaf (commit)
       via  d75371a1fe00d02b7cdb1b495ad6f94bf7fe1247 (commit)
       via  64e0ff2fb6d258420b141e2eab20f9a942d563d6 (commit)
       via  1f2b2cecaf3b3f892c180bc6b9929173de7ac82f (commit)
       via  f7a120e6d295ef24619d6cbd65906a02263111a2 (commit)
       via  ddd3c87fa9e33097336ab7d1c8cf1e11ae241637 (commit)
       via  438e44d599be0cd2365cef90a8bd4fb5e7382835 (commit)
       via  96ace1bb5e44bd778506d28bdbae49f8c079b63e (commit)
       via  3423f0e88a23775ff10a63920a8e1b257f2112b6 (commit)
       via  11106a58bff5e887c24e5a516ffea3a7addc7773 (commit)
       via  7b51ebdfd66b163ac598daa855f48ff52e94dd0a (commit)
       via  5e3e87513b33698a726667bc6916bacb6a4075d0 (commit)
       via  a57510bf5806f8fb9f2c401cadee0471e861fdc2 (commit)
       via  2df122e33f871c438bd1a90d9f901f8d577b3654 (commit)
      from  7e4e2c571cab4913340821f1dd24f52bf6901456 (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 b57bbfd34b27ac099ebabd8fea0b1ebf018ba908
Merge: 9c861e2 9333b29
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Jan 16 14:38:44 2015 +0100

    Merge branch 'feature/reactivity'


commit 9c861e20d4c85d27f370795b831117522af01181
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Jan 16 14:37:00 2015 +0100

    testsuite: fix assertEquals(expected, real) ordering

diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index a315821..1cc16fb 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -30,7 +30,7 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 			system("cd $dir && timeout 15s $command", $ret);
 		}
 		ob_flush();
-		$this->assertEquals($ret, 0);
+		$this->assertEquals(0, $ret);
 	}
 
 	function testScmSvnWebDAV()
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index 481a84d..0590be0 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -119,7 +119,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 	protected function runCommand($cmd)
 	{
 		system(RUN_COMMAND_PREFIX.$cmd, $ret);
-		$this->assertEquals($ret, 0);
+		$this->assertEquals(0, $ret);
 		ob_flush();
 	}
 

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

Summary of changes:
 src/GNUmakefile                                    |    5 +
 src/bin/forge_run_job                              |   17 +--
 src/bin/forge_run_plugin_job                       |   17 +--
 ..._set_password => systasks_wait_until_empty.php} |   47 +++---
 src/bin/systasksd                                  |  152 ++++++++++++++++++++
 src/common/include/Group.class.php                 |    3 +
 src/common/include/PluginManager.class.php         |   16 +--
 src/common/include/SCMPlugin.class.php             |    7 +
 .../include/SysTasksQ.class.php}                   |   36 ++---
 src/common/include/System.class.php                |    2 +
 src/common/include/cron_utils.php                  |   75 +++-------
 src/common/include/database-pgsql.php              |   45 +++++-
 src/common/include/system/pgsql.class.php          |    2 +-
 src/cronjobs/db/massmail.php                       |   12 --
 src/cronjobs/scm/create_scm_repos.php              |   15 +-
 src/db/20141210-systasks.sql                       |   21 +++
 ...nforge-shell.prerm => fusionforge-common.prerm} |    2 +-
 src/docs/README.Plugins                            |    6 +
 src/etc/cron.d/fusionforge-db                      |    3 -
 src/etc/init.d/fusionforge-systasksd               |   66 +++++++++
 .../mediawiki/common/mediawikiPlugin.class.php     |   48 +++----
 .../etc/cron.d/fusionforge-plugin-mediawiki        |    4 -
 src/plugins/scmgit/www/index.php                   |    4 +
 src/plugins/scmsvn/common/SVNPlugin.class.php      |    8 +-
 src/post-install.d/common/common.sh                |    1 +
 src/post-install.d/common/ini.sh                   |    3 +
 .../{db/db.sh => common/systasksd.sh}              |   30 ++--
 src/post-install.d/common/user.sh                  |    8 ++
 src/post-install.d/db/populate.sh                  |    5 +
 src/www/include/html.php                           |    4 +
 src/www/{account/login.php => my/systasks.php}     |   53 ++++---
 src/www/scm/admin/index.php                        |    9 +-
 tests/func/40_SSH/sshTest.php                      |    2 +-
 tests/func/50_PluginsScmGit/gitSSHTest.php         |    3 +-
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php   |    5 +-
 tests/func/50_PluginsScmGit/gitWUITest.php         |    4 +-
 tests/func/50_PluginsScmSvn/svnSSHTest.php         |    3 +-
 tests/func/50_PluginsScmSvn/svnWUITest.php         |    2 +-
 tests/func/50_PluginsScmSvn/svnWebDAVTest.php      |    7 +-
 tests/func/55_PluginsScmMulti/multiSCMTest.php     |    3 +-
 tests/func/60_PluginsMediawiki/mediawikiTest.php   |    3 +-
 tests/func/Testing/SeleniumForge.php               |   16 +--
 tests/func/db_reload.sh                            |    8 +-
 43 files changed, 516 insertions(+), 266 deletions(-)
 copy src/bin/{forge_set_password => systasks_wait_until_empty.php} (59%)
 create mode 100755 src/bin/systasksd
 copy src/{www/search/include/engines/DocsGroupSearchEngine.class.php => common/include/SysTasksQ.class.php} (55%)
 create mode 100644 src/db/20141210-systasks.sql
 copy src/debian/{fusionforge-shell.prerm => fusionforge-common.prerm} (91%)
 create mode 100755 src/etc/init.d/fusionforge-systasksd
 copy src/post-install.d/{db/db.sh => common/systasksd.sh} (63%)
 copy src/www/{account/login.php => my/systasks.php} (50%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list