Skip to content

Commit a9f5587

Browse files
committed
revert some changes
1 parent 60d342c commit a9f5587

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

memory.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

runtime/inspector_server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ fn handle_ws_request(
216216
};
217217

218218
log::info!("Debugger session started.");
219-
let _r = new_session_tx.unbounded_send(inspector_session_proxy);
219+
let _ = new_session_tx.unbounded_send(inspector_session_proxy);
220220
pump_websocket_messages(websocket, inbound_tx, outbound_rx).await;
221221
});
222222

tests/integration/inspector_tests.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ impl StdErrLines {
107107

108108
loop {
109109
let line = self.next().unwrap();
110+
110111
assert_eq!(line, expected_lines[expected_index]);
111112
expected_index += 1;
112113

@@ -510,6 +511,7 @@ async fn inspector_does_not_hang() {
510511
],
511512
)
512513
.await;
514+
513515
tester
514516
.send(json!({"id":4,"method":"Runtime.runIfWaitingForDebugger"}))
515517
.await;
@@ -519,6 +521,7 @@ async fn inspector_does_not_hang() {
519521
&[r#"{"method":"Debugger.paused","#],
520522
)
521523
.await;
524+
522525
tester
523526
.send(json!({"id":5,"method":"Debugger.resume"}))
524527
.await;
@@ -528,6 +531,7 @@ async fn inspector_does_not_hang() {
528531
&[r#"{"method":"Debugger.resumed","params":{}}"#],
529532
)
530533
.await;
534+
531535
for i in 0..128u32 {
532536
let request_id = i + 10;
533537
// Expect the number {i} on stdout.
@@ -543,6 +547,7 @@ async fn inspector_does_not_hang() {
543547
],
544548
)
545549
.await;
550+
546551
tester
547552
.send(json!({"id":request_id,"method":"Debugger.resume"}))
548553
.await;
@@ -560,6 +565,7 @@ async fn inspector_does_not_hang() {
560565
.write_frame(Frame::close_raw(vec![].into()))
561566
.await
562567
.unwrap();
568+
563569
assert_eq!(&tester.stdout_lines.next().unwrap(), "done");
564570
// TODO(bartlomieju): this line makes no sense - if the inspector is connected then the
565571
// process should not exit on its own.
@@ -599,6 +605,7 @@ async fn inspector_runtime_evaluate_does_not_crash() {
599605
.arg("repl")
600606
.arg("--allow-read")
601607
.arg(inspect_flag_with_unique_port("--inspect"))
608+
.env("RUST_BACKTRACE", "1")
602609
.stdin(std::process::Stdio::piped())
603610
.piped_output()
604611
.spawn()
@@ -1127,8 +1134,9 @@ async fn inspector_profile() {
11271134
.unwrap();
11281135

11291136
let mut tester = InspectorTester::create(child, ignore_script_parsed).await;
1130-
tokio::time::sleep(tokio::time::Duration::from_millis(3000)).await;
1137+
11311138
tester.assert_stderr_for_inspect_brk();
1139+
11321140
tester
11331141
.send_many(&[
11341142
json!({"id":1,"method":"Runtime.enable"}),
@@ -1158,6 +1166,7 @@ async fn inspector_profile() {
11581166
&[r#"{"method":"Debugger.paused","#],
11591167
)
11601168
.await;
1169+
11611170
tester.send_many(
11621171
&[
11631172
json!({"id":5,"method":"Profiler.setSamplingInterval","params":{"interval": 100}}),
@@ -1170,6 +1179,7 @@ async fn inspector_profile() {
11701179
&[],
11711180
)
11721181
.await;
1182+
11731183
tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
11741184

11751185
tester
@@ -1185,6 +1195,7 @@ async fn inspector_profile() {
11851195
);
11861196
profile["samples"].as_array().unwrap();
11871197
profile["nodes"].as_array().unwrap();
1198+
11881199
tester.child.kill().unwrap();
11891200
tester.child.wait().unwrap();
11901201
}

0 commit comments

Comments
 (0)