Skip to content
Snippets Groups Projects
Commit 9a5d5461 authored by Adam G-H's avatar Adam G-H Committed by Ted Bowman
Browse files

Issue #3267389 by tedbow, phenaproxima: Disable ComposerExecutableValidator during functional tests

parent 421901f7
No related branches found
No related tags found
1 merge request!222Issue #3267389: Disable ComposerExecutableValidator during function tests
...@@ -15,6 +15,7 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase { ...@@ -15,6 +15,7 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase {
*/ */
protected static $modules = [ protected static $modules = [
'automatic_updates_test_disable_validators', 'automatic_updates_test_disable_validators',
'package_manager_bypass',
'update', 'update',
'update_test', 'update_test',
]; ];
...@@ -32,6 +33,13 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase { ...@@ -32,6 +33,13 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase {
// @see \Drupal\Tests\automatic_updates\Build\CoreUpdateTest::assertReadOnlyFileSystemError() // @see \Drupal\Tests\automatic_updates\Build\CoreUpdateTest::assertReadOnlyFileSystemError()
'automatic_updates.validator.file_system_permissions', 'automatic_updates.validator.file_system_permissions',
'package_manager.validator.file_system', 'package_manager.validator.file_system',
// Disable the Composer executable validator, since it may cause the tests
// to fail if a supported version of Composer is unavailable to the web
// server. This should be okay in most situations because, apart from the
// validator, only Composer Stager needs run Composer, and
// package_manager_bypass is disabling those operations.
'automatic_updates.composer_executable_validator',
'package_manager.validator.composer_executable',
]; ];
/** /**
......
...@@ -398,11 +398,11 @@ class ReadinessValidationTest extends AutomaticUpdatesFunctionalTestBase { ...@@ -398,11 +398,11 @@ class ReadinessValidationTest extends AutomaticUpdatesFunctionalTestBase {
$this->container->get('module_installer')->install([ $this->container->get('module_installer')->install([
'automatic_updates', 'automatic_updates',
'automatic_updates_test', 'automatic_updates_test',
'package_manager_bypass',
]); ]);
// Because all actual staging operations are bypassed by // Because all actual staging operations are bypassed by
// package_manager_bypass, disable this validator because it will complain // package_manager_bypass (enabled by the parent class), disable this
// if there's no actual Composer data to inspect. // validator because it will complain if there's no actual Composer data to
// inspect.
$this->disableValidators(['automatic_updates.staged_projects_validator']); $this->disableValidators(['automatic_updates.staged_projects_validator']);
// The error should be persistently visible, even after the checker stops // The error should be persistently visible, even after the checker stops
......
...@@ -20,7 +20,6 @@ class UpdateLockTest extends AutomaticUpdatesFunctionalTestBase { ...@@ -20,7 +20,6 @@ class UpdateLockTest extends AutomaticUpdatesFunctionalTestBase {
protected static $modules = [ protected static $modules = [
'automatic_updates', 'automatic_updates',
'automatic_updates_test', 'automatic_updates_test',
'package_manager_bypass',
]; ];
/** /**
......
...@@ -33,7 +33,6 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase { ...@@ -33,7 +33,6 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
'block', 'block',
'automatic_updates', 'automatic_updates',
'automatic_updates_test', 'automatic_updates_test',
'package_manager_bypass',
]; ];
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment