From d897a4107f87e691fa0c69aeb6aeb20d810c04a5 Mon Sep 17 00:00:00 2001
From: phenaproxima <phenaproxima@205645.no-reply.drupal.org>
Date: Fri, 4 Feb 2022 14:47:15 +0000
Subject: [PATCH] Issue #3262244 by phenaproxima: HEAD is broken because I made
Zeus mad
---
.../Functional/AutomaticUpdatesFunctionalTestBase.php | 3 +--
tests/src/Functional/ReadinessValidationTest.php | 9 ++++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php b/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
index 6d27adfa7a..6f694e6180 100644
--- a/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
+++ b/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
@@ -59,8 +59,7 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase {
];
}
file_put_contents($services_file, Yaml::encode($services));
- // Ensure the container is rebuilt ASAP.
- $this->kernel->invalidateContainer();
+ $this->rebuildContainer();
}
/**
diff --git a/tests/src/Functional/ReadinessValidationTest.php b/tests/src/Functional/ReadinessValidationTest.php
index ef9890e020..734012dca7 100644
--- a/tests/src/Functional/ReadinessValidationTest.php
+++ b/tests/src/Functional/ReadinessValidationTest.php
@@ -373,11 +373,6 @@ class ReadinessValidationTest extends AutomaticUpdatesFunctionalTestBase {
* Tests that stored validation results are deleted after an update.
*/
public function testStoredResultsClearedAfterUpdate(): void {
- // Because all actual staging operations are bypassed by
- // package_manager_bypass, disable this validator because it will complain
- // if there's no actual Composer data to inspect.
- $this->disableValidators(['automatic_updates.staged_projects_validator']);
-
$assert_session = $this->assertSession();
$page = $this->getSession()->getPage();
$this->drupalLogin($this->checkerRunnerUser);
@@ -396,6 +391,10 @@ class ReadinessValidationTest extends AutomaticUpdatesFunctionalTestBase {
'automatic_updates_test',
'package_manager_bypass',
]);
+ // Because all actual staging operations are bypassed by
+ // package_manager_bypass, disable this validator because it will complain
+ // if there's no actual Composer data to inspect.
+ $this->disableValidators(['automatic_updates.staged_projects_validator']);
// The error should be persistently visible, even after the checker stops
// flagging it.
--
GitLab