Fix running vim tests with --features neovim (#36014)
This was broken incidentally in https://github.com/zed-industries/zed/pull/33417 A better fix would be to fix app shutdown to take control of the executor so that we *can* run foreground tasks; but that is a bit fiddly (draft #36015) Release Notes: - N/A
This commit is contained in:
parent
481e3e5092
commit
1a798830cb
4 changed files with 6 additions and 1 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -18025,6 +18025,7 @@ dependencies = [
|
||||||
"command_palette_hooks",
|
"command_palette_hooks",
|
||||||
"db",
|
"db",
|
||||||
"editor",
|
"editor",
|
||||||
|
"env_logger 0.11.8",
|
||||||
"futures 0.3.31",
|
"futures 0.3.31",
|
||||||
"git_ui",
|
"git_ui",
|
||||||
"gpui",
|
"gpui",
|
||||||
|
|
|
@ -167,6 +167,7 @@ fn generate_test_function(
|
||||||
));
|
));
|
||||||
cx_teardowns.extend(quote!(
|
cx_teardowns.extend(quote!(
|
||||||
dispatcher.run_until_parked();
|
dispatcher.run_until_parked();
|
||||||
|
#cx_varname.executor().forbid_parking();
|
||||||
#cx_varname.quit();
|
#cx_varname.quit();
|
||||||
dispatcher.run_until_parked();
|
dispatcher.run_until_parked();
|
||||||
));
|
));
|
||||||
|
@ -232,7 +233,7 @@ fn generate_test_function(
|
||||||
cx_teardowns.extend(quote!(
|
cx_teardowns.extend(quote!(
|
||||||
drop(#cx_varname_lock);
|
drop(#cx_varname_lock);
|
||||||
dispatcher.run_until_parked();
|
dispatcher.run_until_parked();
|
||||||
#cx_varname.update(|cx| { cx.quit() });
|
#cx_varname.update(|cx| { cx.background_executor().forbid_parking(); cx.quit(); });
|
||||||
dispatcher.run_until_parked();
|
dispatcher.run_until_parked();
|
||||||
));
|
));
|
||||||
continue;
|
continue;
|
||||||
|
@ -247,6 +248,7 @@ fn generate_test_function(
|
||||||
));
|
));
|
||||||
cx_teardowns.extend(quote!(
|
cx_teardowns.extend(quote!(
|
||||||
dispatcher.run_until_parked();
|
dispatcher.run_until_parked();
|
||||||
|
#cx_varname.executor().forbid_parking();
|
||||||
#cx_varname.quit();
|
#cx_varname.quit();
|
||||||
dispatcher.run_until_parked();
|
dispatcher.run_until_parked();
|
||||||
));
|
));
|
||||||
|
|
|
@ -24,6 +24,7 @@ command_palette.workspace = true
|
||||||
command_palette_hooks.workspace = true
|
command_palette_hooks.workspace = true
|
||||||
db.workspace = true
|
db.workspace = true
|
||||||
editor.workspace = true
|
editor.workspace = true
|
||||||
|
env_logger.workspace = true
|
||||||
futures.workspace = true
|
futures.workspace = true
|
||||||
gpui.workspace = true
|
gpui.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
|
|
|
@ -15,6 +15,7 @@ impl VimTestContext {
|
||||||
if cx.has_global::<VimGlobals>() {
|
if cx.has_global::<VimGlobals>() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
env_logger::try_init().ok();
|
||||||
cx.update(|cx| {
|
cx.update(|cx| {
|
||||||
let settings = SettingsStore::test(cx);
|
let settings = SettingsStore::test(cx);
|
||||||
cx.set_global(settings);
|
cx.set_global(settings);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue