Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable random_channel_buffer_tests to run on Linux #10863

Merged
merged 2 commits into from
May 1, 2024
Merged

Enable random_channel_buffer_tests to run on Linux #10863

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9711af9
Enable random_channel_buffer_tests to run on Linux
kain88-de Apr 22, 2024
b6a4eca
Update crates/collab/src/tests/test_server.rs
kain88-de Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion crates/collab/src/tests/test_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ impl TestServer {
node_runtime: FakeNodeRuntime::new(),
});

let os_keymap = if cfg!(target_os = "linux") {
"keymaps/default-linux.json"
} else {
"keymaps/default-macos.json"
};

cx.update(|cx| {
theme::init(theme::LoadThemes::JustBase, cx);
Project::init(&client, cx);
Expand All @@ -285,7 +291,7 @@ impl TestServer {
file_finder::init(cx);
menu::init();
remote_projects::init(client.clone(), cx);
settings::KeymapFile::load_asset("keymaps/default-macos.json", cx).unwrap();
settings::KeymapFile::load_asset(os_keymap, cx).unwrap();
});

client
Expand Down