Skip to content

Commit

Permalink
Enable random_channel_buffer_tests to run on Linux (zed-industries#10863
Browse files Browse the repository at this point in the history
)

With this patch applied I can see the following line in the test output:

test tests::random_channel_buffer_tests::test_random_channel_buffers has
been running for over 60 seconds

Without it I run in a failure with 'Invalid keystroke `cmk-,`



Release Notes:

- N/A

---------

Co-authored-by: Max Linke <kain88-de@users.noreply.github.com>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
  • Loading branch information
3 people authored and luckydye committed May 2, 2024
1 parent 8c573a9 commit 169a583
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion crates/collab/src/tests/test_server.rs
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

0 comments on commit 169a583

Please sign in to comment.