Skip to content

Commit 1f68415

Browse files
authored
Increase timeout of hover_on_external_command (nushell#16818)
Recently `hover_on_external_command` has been timing out and failing CI runs. is 10 seconds long? yeah. is it quicker than re-running ci jobs? also yeah.
1 parent c17f6d7 commit 1f68415

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

crates/nu-lsp/src/hover.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ mod hover_tests {
228228
use assert_json_diff::assert_json_eq;
229229
use nu_test_support::fs::fixtures;
230230
use rstest::rstest;
231+
use std::time::Duration;
231232

232233
#[rstest]
233234
#[case::variable("var.nu", (2, 0), "```\ntable\n``` \n---\nimmutable")]
@@ -260,7 +261,9 @@ mod hover_tests {
260261

261262
open_unchecked(&client_connection, script.clone());
262263
let (line, character) = cursor;
263-
let resp = send_hover_request(&client_connection, script, line, character);
264+
let resp = send_hover_request(&client_connection, script, line, character)
265+
.recv_timeout(Duration::from_secs(3))
266+
.unwrap();
264267

265268
assert_json_eq!(
266269
result_from_message(resp)["contents"]["value"],
@@ -277,7 +280,9 @@ mod hover_tests {
277280
let script = path_to_uri(&script);
278281

279282
open_unchecked(&client_connection, script.clone());
280-
let resp = send_hover_request(&client_connection, script, 6, 2);
283+
let resp = send_hover_request(&client_connection, script, 6, 2)
284+
.recv_timeout(Duration::from_secs(10))
285+
.unwrap();
281286

282287
let hover_text = result_from_message(resp)["contents"]["value"].to_string();
283288

@@ -311,7 +316,9 @@ mod hover_tests {
311316

312317
open_unchecked(&client_connection, script_uri.clone());
313318
let (line, character) = cursor;
314-
let resp = send_hover_request(&client_connection, script_uri, line, character);
319+
let resp = send_hover_request(&client_connection, script_uri, line, character)
320+
.recv_timeout(Duration::from_secs(3))
321+
.unwrap();
315322
let result = result_from_message(resp);
316323

317324
let actual = result["contents"]["value"].to_string().replace("\\r", "");

crates/nu-lsp/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ mod tests {
671671
uri: Uri,
672672
line: u32,
673673
character: u32,
674-
) -> Message {
674+
) -> &crossbeam_channel::Receiver<Message> {
675675
client_connection
676676
.sender
677677
.send(Message::Request(lsp_server::Request {
@@ -688,9 +688,6 @@ mod tests {
688688
}))
689689
.unwrap();
690690

691-
client_connection
692-
.receiver
693-
.recv_timeout(Duration::from_secs(3))
694-
.unwrap()
691+
&client_connection.receiver
695692
}
696693
}

crates/nu-lsp/src/notification.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ mod tests {
155155
use lsp_types::Range;
156156
use nu_test_support::fs::fixtures;
157157
use rstest::rstest;
158+
use std::time::Duration;
158159

159160
#[rstest]
160161
#[case::full(
@@ -186,7 +187,9 @@ hello"#,
186187

187188
open_unchecked(&client_connection, script.clone());
188189
update(&client_connection, script.clone(), text, range);
189-
let resp = send_hover_request(&client_connection, script, 3, 0);
190+
let resp = send_hover_request(&client_connection, script, 3, 0)
191+
.recv_timeout(Duration::from_secs(3))
192+
.unwrap();
190193

191194
assert_json_eq!(
192195
result_from_message(resp),

crates/nu-lsp/src/workspace.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ mod tests {
552552
};
553553
use nu_test_support::fs::fixtures;
554554
use rstest::rstest;
555+
use std::time::Duration;
555556

556557
// Helper functions to reduce JSON duplication
557558
fn make_range(
@@ -663,7 +664,9 @@ mod tests {
663664

664665
// use a hover request to interrupt
665666
if immediate_cancellation {
666-
send_hover_request(client_connection, uri, line, character);
667+
send_hover_request(client_connection, uri, line, character)
668+
.recv_timeout(Duration::from_secs(3))
669+
.unwrap();
667670
}
668671

669672
(0..num)

0 commit comments

Comments
 (0)