From fd1154b7d380795cb13f385db5f6e95e90de51e3 Mon Sep 17 00:00:00 2001
From: nod_ <nod_@598310.no-reply.drupal.org>
Date: Tue, 13 Aug 2024 11:16:26 +0200
Subject: [PATCH] Revert "Issue #3467391 by catch, smustgrave: Reduce CPU
requirement and concurrency for unit tests"
This reverts commit 52dc1d760985fb2e7e6e8e94a09d685103e073af.
---
.gitlab-ci/pipeline.yml | 3 +--
core/modules/phpass/tests/src/Unit/PasswordVerifyTest.php | 1 -
core/phpcs.xml.dist | 3 +--
.../Drupal/Tests/Component/Datetime/TimeWithNoRequestTest.php | 1 -
core/tests/Drupal/Tests/Component/Utility/RectangleTest.php | 1 -
core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php | 1 -
core/tests/Drupal/Tests/Component/Utility/XssTest.php | 1 -
.../Composer/Plugin/Scaffold/Functional/ComposerHookTest.php | 1 -
core/tests/Drupal/Tests/Core/Command/QuickStartTest.php | 1 -
core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php | 1 -
.../Core/EventSubscriber/ActiveLinkResponseFilterTest.php | 1 -
core/tests/Drupal/Tests/Core/Recipe/RecipeQuickStartTest.php | 1 -
core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php | 1 -
core/tests/Drupal/Tests/Core/Site/SettingsTest.php | 1 -
core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php | 1 -
core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php | 1 -
core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php | 1 -
17 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 3c45b444356e..aee319106be0 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -204,8 +204,7 @@ variables:
- <<: *with-database
variables:
TESTSUITE: PHPUnit-Unit
- KUBERNETES_CPU_REQUEST: "1"
- CONCURRENCY: 6
+ KUBERNETES_CPU_REQUEST: "16"
'âœ…ï¸ PHPStan Tests':
<<: [ *default-job-settings ]
diff --git a/core/modules/phpass/tests/src/Unit/PasswordVerifyTest.php b/core/modules/phpass/tests/src/Unit/PasswordVerifyTest.php
index f32cb022447f..dd897c00a0fd 100644
--- a/core/modules/phpass/tests/src/Unit/PasswordVerifyTest.php
+++ b/core/modules/phpass/tests/src/Unit/PasswordVerifyTest.php
@@ -14,7 +14,6 @@
*
* @coversDefaultClass \Drupal\phpass\Password\PhpassHashedPassword
* @group phpass
- * @group #slow
*/
class PasswordVerifyTest extends UnitTestCase {
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 8467644b0479..54bdfe45052a 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -8,9 +8,8 @@
<exclude-pattern>*/node_modules/*</exclude-pattern>
<!--Exclude third party code.-->
<exclude-pattern>./assets/vendor/*</exclude-pattern>
- <!--Exclude the PHPStan baseline and temp dir from coding standards.-->
+ <!--Exclude the PHPStan baseline from coding standards.-->
<exclude-pattern>./core/.phpstan-baseline.php</exclude-pattern>
- <exclude-pattern>./core/phpstan-tmp/*</exclude-pattern>
<!-- Exclude third-party code maintained within core that does not follow our standards. -->
<!-- @todo This rule may be removed when https://www.drupal.org/node/1848264 is resolved. -->
<exclude-pattern>./core/lib/Drupal/Component/Diff/</exclude-pattern>
diff --git a/core/tests/Drupal/Tests/Component/Datetime/TimeWithNoRequestTest.php b/core/tests/Drupal/Tests/Component/Datetime/TimeWithNoRequestTest.php
index d4b02de5d30a..69bac3cb0282 100644
--- a/core/tests/Drupal/Tests/Component/Datetime/TimeWithNoRequestTest.php
+++ b/core/tests/Drupal/Tests/Component/Datetime/TimeWithNoRequestTest.php
@@ -12,7 +12,6 @@
*
* @coversDefaultClass \Drupal\Component\Datetime\Time
* @group Datetime
- * @group #slow
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
*/
diff --git a/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php b/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
index c43054055fbc..f7a77f6e7db5 100644
--- a/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
@@ -10,7 +10,6 @@
/**
* @coversDefaultClass \Drupal\Component\Utility\Rectangle
* @group Image
- * @group #slow
*/
class RectangleTest extends TestCase {
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index f2fd94290332..0cc920d5f0da 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -9,7 +9,6 @@
/**
* @group Utility
- * @group #slow
*
* @coversDefaultClass \Drupal\Component\Utility\UrlHelper
*/
diff --git a/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/core/tests/Drupal/Tests/Component/Utility/XssTest.php
index 6f8e09425b02..15b1f0384342 100644
--- a/core/tests/Drupal/Tests/Component/Utility/XssTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/XssTest.php
@@ -23,7 +23,6 @@
* CVE-2006-1226 (= rev. 1.112?), CVE-2008-0273, CVE-2008-3740.
*
* @group Utility
- * @group #slow
* @coversDefaultClass \Drupal\Component\Utility\Xss
* @runTestsInSeparateProcesses
*/
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
index 14d896ad1823..7c7a10909c1b 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
@@ -23,7 +23,6 @@
* information.
*
* @group Scaffold
- * @group #slow
*/
class ComposerHookTest extends BuildTestBase {
diff --git a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php
index 07a3740f36a7..17c12d2d394e 100644
--- a/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php
+++ b/core/tests/Drupal/Tests/Core/Command/QuickStartTest.php
@@ -24,7 +24,6 @@
* @requires extension pdo_sqlite
*
* @group Command
- * @group #slow
*/
class QuickStartTest extends TestCase {
diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
index 845937dee547..e01add014774 100644
--- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
@@ -14,7 +14,6 @@
/**
* @coversDefaultClass \Drupal\Core\DrupalKernel
* @group DrupalKernel
- * @group #slow
*/
class DrupalKernelTest extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
index 4c830fecfe5f..cdd08cfbf431 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
@@ -27,7 +27,6 @@
/**
* @coversDefaultClass \Drupal\Core\EventSubscriber\ActiveLinkResponseFilter
* @group EventSubscriber
- * @group #slow
*/
class ActiveLinkResponseFilterTest extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Recipe/RecipeQuickStartTest.php b/core/tests/Drupal/Tests/Core/Recipe/RecipeQuickStartTest.php
index 65bedfff3d0d..c71cd91bff05 100644
--- a/core/tests/Drupal/Tests/Core/Recipe/RecipeQuickStartTest.php
+++ b/core/tests/Drupal/Tests/Core/Recipe/RecipeQuickStartTest.php
@@ -25,7 +25,6 @@
*
* @group Command
* @group Recipe
- * @group #slow
*/
class RecipeQuickStartTest extends TestCase {
diff --git a/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php b/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php
index 59f17d3e15fa..ee3394b6391d 100644
--- a/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php
+++ b/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php
@@ -15,7 +15,6 @@
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
* @group Security
- * @group #slow
*/
class RequestSanitizerTest extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
index cb00324bdaf3..d378dcf983c3 100644
--- a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
+++ b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
@@ -14,7 +14,6 @@
* @coversDefaultClass \Drupal\Core\Site\Settings
* @runTestsInSeparateProcesses
* @group Site
- * @group #slow
*/
class SettingsTest extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php b/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
index bfb3c31e58ee..5ec76e7820fc 100644
--- a/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
@@ -10,7 +10,6 @@
/**
* @group TestSuites
* @group Test
- * @group #slow
*/
class PhpUnitCliTest extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php b/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php
index 9c8f72087e16..d183cd752d17 100644
--- a/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php
+++ b/core/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php
@@ -19,7 +19,6 @@
*
* @coversDefaultClass \Drupal\Core\Update\UpdateRegistry
* @group Update
- * @group #slow
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
*/
diff --git a/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php b/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
index a5e71bfb4d8c..893a55e93092 100644
--- a/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
+++ b/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
@@ -26,7 +26,6 @@
* @see \Drupal\TestSite\Commands\TestSiteTearDownCommand
*
* @group Setup
- * @group #slow
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
*/
--
GitLab