Commit 9cdac07d authored by webchick's avatar webchick

Issue #2258831 by sun | Wim Leers: Stream wrappers of test runner are not...

Issue #2258831 by sun | Wim Leers: Stream wrappers of test runner are not restored after test completion.
parent a2a6f6cd
......@@ -1062,7 +1062,7 @@ private function prepareEnvironment() {
// way.
// - WebTestBase re-initializes Drupal stream wrappers after installation.
// The original stream wrappers are restored after the test run.
// @see TestBase::tearDown()
// @see TestBase::restoreEnvironment()
$wrappers = file_get_stream_wrappers();
foreach ($wrappers as $scheme => $info) {
stream_wrapper_unregister($scheme);
......@@ -1221,6 +1221,9 @@ private function restoreEnvironment() {
}
conf_path(TRUE, TRUE);
// Restore stream wrappers of the test runner.
file_get_stream_wrappers();
// Restore original shutdown callbacks.
$callbacks = &drupal_register_shutdown_function();
$callbacks = $this->originalShutdownCallbacks;
......
......@@ -88,14 +88,6 @@ public function batchPage(Request $request) {
$page = element_info('page');
$page['#show_messages'] = FALSE;
// @todo For some reason, _drupal_bootstrap_code()'s call to
// file_get_stream_wrappers() to register all stream wrappers is
// insufficient in the case of the no-JS version of the batch page:
// checking if a needed CSS aggregate already exists in the file system
// will fail unless we re-register the stream wrappers here! This may be
// a PHP bug.
file_get_stream_wrappers();
$page = $this->render($page);
return $page;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment