diff -u b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigOverrideImportTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigOverrideImportTest.php --- b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigOverrideImportTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigOverrideImportTest.php @@ -40,13 +40,16 @@ $staging = \Drupal::service('config.storage.staging'); $this->copyConfig(\Drupal::service('config.storage'), $staging); + // Uninstall the language module and its dependencies so we can test + // enabling the language module and creating overrides at the same time + // during a configuration synchronisation. \Drupal::moduleHandler()->uninstall(array('language')); // Ensure that the current site has no overrides registered to the // ConfigFactory. $this->rebuildContainer(); /* @var \Drupal\Core\Config\StorageInterface $override_staging */ - $override_staging = new FileStorage(config_get_config_directory(CONFIG_STAGING_DIRECTORY) . '/language/fr'); + $override_staging = $staging->createCollection('language.fr'); // Create some overrides in staging. $override_staging->write('system.site', array('name' => 'FR default site name')); $override_staging->write('system.maintenance', array('message' => 'FR message: @site is currently under maintenance. We should be back shortly. Thank you for your patience'));