From 426f275c034f827e8b20b63798a674d41a48873c Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 12 Jan 2022 11:21:21 +0100 Subject: [PATCH 1/7] :bulb: Add additional phpdoc to \DBBackup::GetMysqlCliTlsOptions --- setup/backup.class.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php index d6cc51e96..952ce2576 100644 --- a/setup/backup.class.inc.php +++ b/setup/backup.class.inc.php @@ -470,6 +470,7 @@ EOF; * @uses \CMDBSource::GetDBVersion() so needs a connection opened ! * * @since 2.5.0 N°1260 + * @since 2.6.2 2.7.0 N°2336 Call DB to get vendor and version (so CMDBSource must be init before calling this method) * @link https://dev.mysql.com/doc/refman/5.6/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections" */ public static function GetMysqlCliTlsOptions($oConfig) From 0fd2ea6a47d69ef4d925c91486d5d675858c7955 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 13 Jan 2022 08:56:54 +0100 Subject: [PATCH 2/7] :art: phpunit.xml code formatting --- test/phpunit.xml.dist | 86 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 293cc826f..26ceb0464 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -40,49 +40,49 @@ timeoutForLargeTests="60" verbose="false"> - - - ../env-production/*/test - - - core - - - webservices - - - itop-tickets - - - itop-config - - - application - - - - status - - - setup - - - integration - - - coreExtensions - - + + + ../env-production/*/test + + + core + + + webservices + + + itop-tickets + + + itop-config + + + application + + + + status + + + setup + + + integration + + + coreExtensions + + - - - - ../core/apc-emulation.php - ../core/ormlinkset.class.inc.php - ../datamodels/2.x/itop-tickets/main.itop-tickets.php - - + + + + ../core/apc-emulation.php + ../core/ormlinkset.class.inc.php + ../datamodels/2.x/itop-tickets/main.itop-tickets.php + + From cacc3a3085f6239e410fdd3a1a23ff69ed012fe1 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 13 Jan 2022 09:41:54 +0100 Subject: [PATCH 3/7] :wrench: Reorder test suites for better readability --- test/phpunit.xml.dist | 51 +++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 26ceb0464..2f53739f1 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -41,38 +41,41 @@ verbose="false"> - - ../env-production/*/test + + application core - - webservices - - - itop-tickets - - - itop-config - - - application - - - - status - - - setup + + coreExtensions integration - - coreExtensions + + itop-config + + + itop-tickets + + + + setup + + + status + + + webservices + + + + ../env-production/*/test From decb802df414dc0b2b354d30a45f53dd9b1971a2 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 13 Jan 2022 09:48:07 +0100 Subject: [PATCH 4/7] Revert ":wrench: Reorder test suites for better readability" This reverts commit cacc3a3085f6239e410fdd3a1a23ff69ed012fe1. --- test/phpunit.xml.dist | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 2f53739f1..26ceb0464 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -41,41 +41,38 @@ verbose="false"> - - application + + ../env-production/*/test core - - coreExtensions - - - integration - - - itop-config + + webservices itop-tickets - - - setup - status - - webservices + + setup - - - ../env-production/*/test + + integration + + + coreExtensions From 5ac5d649aada9bba1a43e107e990b29b0052b919 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 13 Jan 2022 12:14:39 +0100 Subject: [PATCH 5/7] :wrench: Try again : reorder test suites for better readability Jenkins should now be fixed --- test/phpunit.xml.dist | 51 +++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 26ceb0464..2f53739f1 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -41,38 +41,41 @@ verbose="false"> - - ../env-production/*/test + + application core - - webservices - - - itop-tickets - - - itop-config - - - application - - - - status - - - setup + + coreExtensions integration - - coreExtensions + + itop-config + + + itop-tickets + + + + setup + + + status + + + webservices + + + + ../env-production/*/test From e8e170fb063b24e96b2ab8cdd547b526a64ad1a7 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 13 Jan 2022 13:05:09 +0100 Subject: [PATCH 6/7] :wrench: phpunit.xml reorder testSuites again --- test/phpunit.xml.dist | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 2f53739f1..133265bdb 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -53,17 +53,18 @@ integration - + itop-config - + itop-tickets + + --> setup From a43adcd20295562b7caf3ce706b206b1870c7074 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 13 Jan 2022 13:11:26 +0100 Subject: [PATCH 7/7] :wrench: phpunit.xml comment OQL better Was executing on Jenkins :( --- test/phpunit.xml.dist | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 133265bdb..f037fdc78 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -59,12 +59,10 @@ itop-tickets - + + setup