From 89aded5399c0f8c608b800f7b946a297b346e6a1 Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Sun, 7 Jan 2024 21:48:32 +0900 Subject: [PATCH 1/5] Fix one of flakey test in protocol tests --- lib/debug/server_cdp.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/debug/server_cdp.rb b/lib/debug/server_cdp.rb index d4e012fe2..33358bf3d 100644 --- a/lib/debug/server_cdp.rb +++ b/lib/debug/server_cdp.rb @@ -489,7 +489,12 @@ def process id: SecureRandom.hex when 'Runtime.terminateExecution' send_response req - exit + if SESSION.in_subsession? + @q_msg << 'kill!' + else + @q_msg << 'kill!' + pause + end when 'Page.startScreencast', 'Emulation.setTouchEmulationEnabled', 'Emulation.setEmitTouchEventsForMouse', 'Runtime.compileScript', 'Page.getResourceContent', 'Overlay.setPausedInDebuggerMessage', 'Runtime.releaseObjectGroup', 'Runtime.discardConsoleEntries', 'Log.clear', 'Runtime.runIfWaitingForDebugger' From 01bef21062189f97c678798bc560639e81a72992 Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Mon, 8 Jan 2024 21:51:36 +0900 Subject: [PATCH 2/5] Update lib/debug/server_cdp.rb Co-authored-by: Stan Lo --- lib/debug/server_cdp.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/debug/server_cdp.rb b/lib/debug/server_cdp.rb index 33358bf3d..31c2d1156 100644 --- a/lib/debug/server_cdp.rb +++ b/lib/debug/server_cdp.rb @@ -489,12 +489,8 @@ def process id: SecureRandom.hex when 'Runtime.terminateExecution' send_response req - if SESSION.in_subsession? - @q_msg << 'kill!' - else - @q_msg << 'kill!' - pause - end + @q_msg << 'kill!' + pause unless SESSION.in_subsession? when 'Page.startScreencast', 'Emulation.setTouchEmulationEnabled', 'Emulation.setEmitTouchEventsForMouse', 'Runtime.compileScript', 'Page.getResourceContent', 'Overlay.setPausedInDebuggerMessage', 'Runtime.releaseObjectGroup', 'Runtime.discardConsoleEntries', 'Log.clear', 'Runtime.runIfWaitingForDebugger' From af9ef5c8e119b1876bfb4ee6a71cd40c76fd7b97 Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Mon, 29 Jan 2024 20:03:43 +0900 Subject: [PATCH 3/5] Use quit! command instead of kill! command --- lib/debug/server_cdp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/debug/server_cdp.rb b/lib/debug/server_cdp.rb index 31c2d1156..fe2ccfc9d 100644 --- a/lib/debug/server_cdp.rb +++ b/lib/debug/server_cdp.rb @@ -489,7 +489,7 @@ def process id: SecureRandom.hex when 'Runtime.terminateExecution' send_response req - @q_msg << 'kill!' + @q_msg << 'quit!' pause unless SESSION.in_subsession? when 'Page.startScreencast', 'Emulation.setTouchEmulationEnabled', 'Emulation.setEmitTouchEventsForMouse', 'Runtime.compileScript', 'Page.getResourceContent', 'Overlay.setPausedInDebuggerMessage', From d5f64970b3b130b37ee611d733ee5d012e3e7d27 Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Mon, 29 Jan 2024 20:53:49 +0900 Subject: [PATCH 4/5] debug --- lib/debug/server_cdp.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/debug/server_cdp.rb b/lib/debug/server_cdp.rb index fe2ccfc9d..3998a5ca8 100644 --- a/lib/debug/server_cdp.rb +++ b/lib/debug/server_cdp.rb @@ -419,6 +419,7 @@ def send **msg def extract_data first_group = @sock.getbyte + raise Detach if first_group == nil fin = first_group & 0b10000000 != 128 raise 'Unsupported' if fin From ecebe71e922fb8ca6ea185952ef34425fbcc2b3f Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Mon, 29 Jan 2024 20:58:28 +0900 Subject: [PATCH 5/5] fix --- lib/debug/server_cdp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/debug/server_cdp.rb b/lib/debug/server_cdp.rb index 3998a5ca8..c1e2d8352 100644 --- a/lib/debug/server_cdp.rb +++ b/lib/debug/server_cdp.rb @@ -490,7 +490,7 @@ def process id: SecureRandom.hex when 'Runtime.terminateExecution' send_response req - @q_msg << 'quit!' + @q_msg << 'q!' pause unless SESSION.in_subsession? when 'Page.startScreencast', 'Emulation.setTouchEmulationEnabled', 'Emulation.setEmitTouchEventsForMouse', 'Runtime.compileScript', 'Page.getResourceContent', 'Overlay.setPausedInDebuggerMessage',