From 36120f32436d7c4e888adcd842208dd8b912475e Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Wed, 26 Apr 2023 21:12:32 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20Les=20tests=20lagacy-php=20doivent=20uni?=
=?UTF-8?q?quement=20r=C3=A9cup=C3=A9rer=20des=20fichiers=20d=E2=80=99?=
=?UTF-8?q?=C3=A9poque?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/tests/LegacyUnitPhpTest.php | 4 ++++
ecrire/tests/legacy/test_fonctions.php | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ecrire/tests/LegacyUnitPhpTest.php b/ecrire/tests/LegacyUnitPhpTest.php
index 0adfb7bbaf..63e410d1ad 100644
--- a/ecrire/tests/LegacyUnitPhpTest.php
+++ b/ecrire/tests/LegacyUnitPhpTest.php
@@ -23,6 +23,7 @@ use PHPUnit\Framework\TestCase;
* LegacyUnitPhpTest test - runs all the unit/ php tests and check the ouput is 'OK'
*/
#[Group('legacy')]
+#[Group('legacy-php')]
class LegacyUnitPhpTest extends TestCase
{
#[DataProvider('providerLegacyPhpfileName')]
@@ -41,6 +42,9 @@ class LegacyUnitPhpTest extends TestCase
require_once(__DIR__ . '/legacy/test.inc');
$liste_fichiers = tests_legacy_lister('php');
+ $liste_fichiers = array_filter($liste_fichiers, function($f) {
+ return str_contains(file_get_contents($f), 'test.inc');
+ });
$tests = [];
foreach ($liste_fichiers as $k => $fichier) {
$tests[$k] = [$fichier, 'OK'];
diff --git a/ecrire/tests/legacy/test_fonctions.php b/ecrire/tests/legacy/test_fonctions.php
index a8b9a7462e..c0aedbed1f 100644
--- a/ecrire/tests/legacy/test_fonctions.php
+++ b/ecrire/tests/legacy/test_fonctions.php
@@ -210,8 +210,10 @@ function tests_legacy_lister($extension = null)
{
// chercher les bases de tests
$bases = [_DIR_TESTS . 'tests/legacy/unit'];
-
foreach (creer_chemin() as $d) {
+ if ($d === 'ecrire/') {
+ continue;
+ }
if ($d && @is_dir("{$d}tests")) {
$bases[] = "{$d}tests";
}
--
GitLab