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.1 has been updated
via 873605621e800711d6cc1c6a5df7bee0b669115e (commit)
from 2f5954d041397786e8650cfa0f26396a35c875ae (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=873605621e800711d6cc1c6a5df7bee0b669115e
commit 873605621e800711d6cc1c6a5df7bee0b669115e
Author: Roland Mas <[email protected]>
Date: Tue Nov 10 18:22:48 2020 +0100
Try fixing testsuite on Debian 10
diff --git a/tests/code/syntax/SyntaxTest.php b/tests/code/syntax/SyntaxTest.php
index 7e03dc0..ab3f567 100644
--- a/tests/code/syntax/SyntaxTest.php
+++ b/tests/code/syntax/SyntaxTest.php
@@ -23,6 +23,7 @@ class Syntax_Tests extends PHPUnit_Framework_TestCase
$output = `type pcregrep`;
$this->fail('You should probably install "pcregrep" :
`type pcregrep` reports "'.$output);
}
+ $this->assertEquals(0,$rc);
}
/**
diff --git a/tests/code_and_unit_tests.php b/tests/code_and_unit_tests.php
index 6400b36..e62f3cf 100644
--- a/tests/code_and_unit_tests.php
+++ b/tests/code_and_unit_tests.php
@@ -23,17 +23,8 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
}
include_once 'PHPUnit/Autoload.php';
-// if (@include_once '/usr/local/share/php/vendor/autoload.php') {
-// $phpunitversion = 6;
class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
-// } else {
-// $phpunitversion = 4;
-// if (!@include_once 'PHPUnit/Autoload.php') {
-// include_once 'PHPUnit/Framework.php';
-// require_once 'PHPUnit/TextUI/TestRunner.php';
-// }
-// }
@include_once 'PHP/Token/Stream/Autoload.php';
@include_once 'Text/Template/Autoload.php';
diff --git a/tests/func_tests.php b/tests/func_tests.php
index 2c7211a..e91fbdc 100644
--- a/tests/func_tests.php
+++ b/tests/func_tests.php
@@ -23,17 +23,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'AllTests::main');
}
-if (@include_once '/usr/local/share/php/vendor/autoload.php') {
- $phpunitversion = 6;
- class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
- class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
-} else {
- $phpunitversion = 4;
- if (!@include_once 'PHPUnit/Autoload.php') {
- include_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
- }
-}
+include_once 'PHPUnit/Autoload.php';
+class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
+class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
class AllTests {
public static function main() {
diff --git a/tests/unit/utils/HtmlPurifierTest.php
b/tests/unit/utils/HtmlPurifierTest.php
index c8f6027..0af42f9 100644
--- a/tests/unit/utils/HtmlPurifierTest.php
+++ b/tests/unit/utils/HtmlPurifierTest.php
@@ -28,7 +28,7 @@ class HtmlPurifier_Tests extends PHPUnit_Framework_TestCase
$this->fail('You probably need to install htmlpurifier :
'.$expected->getMessage());
return;
}
-
+ $this->assertEquals(0,0);
}
}
-----------------------------------------------------------------------
Summary of changes:
tests/code/syntax/SyntaxTest.php | 1 +
tests/code_and_unit_tests.php | 9 ---------
tests/func_tests.php | 14 +++-----------
tests/unit/utils/HtmlPurifierTest.php | 2 +-
4 files changed, 5 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
