mirrors/debugpy
1
0
Fork 0
mirror of https://github.com/microsoft/debugpy.git synced 2025-12-23 08:48:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #1769: Logpoint messages aren't printed for "launch"

Browse source 
When using launcher to redirect output, tell pydevd to not perform redirection.

Always propagate "output" events from the server to the IDE.

Fix test_log_point to not assume that logpoint output is strictly ordered wrt regular output.
This commit is contained in:
Pavel Minaev 2019-09-16 07:34:55 -07:00 • committed by Pavel Minaev
parent 9692e9770f
commit 0be597c4b2
3 changed files with 33 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ptvsd/adapter/ide.py
View file

@ -223,6 +223,10 @@ class IDE(components.Component):
self.session.spawn_debuggee(request, sudo, args, console, console_title)
if "RedirectOutput" in self.session.debug_options:
# The launcher is doing output redirection, so we don't need the server.
request.arguments["debugOptions"].remove("RedirectOutput")
@_start_message_handler
def attach_request(self, request):
if self.session.no_debug:

7
src/ptvsd/adapter/server.py
View file

@ -128,13 +128,6 @@ class Server(components.Component):
if self.ide.client_id not in ("visualstudio", "vsformac"):
self.ide.propagate_after_start(event)
@message_handler
def output_event(self, event):
category = event("category", "console")
# If there is a launcher, it's handling stdout and stderr.
if not self.launcher or category not in ("stdout", "stderr"):
self.ide.propagate_after_start(event)
@message_handler
def exited_event(self, event):
# If there is a launcher, it's handling the exit code.

70
tests/ptvsd/server/test_breakpoints.py
View file

@ -28,10 +28,7 @@ def test_path_with_ampersand(start_method, run_as):
session.start_debugging()
session.wait_for_stop(
"breakpoint",
expected_frames=[
some.dap.frame(test_py, line="two"),
],
"breakpoint", expected_frames=[some.dap.frame(test_py, line="two")]
)
session.request_continue()
@ -200,9 +197,11 @@ def test_log_point(pyfile, start_method, run_as, condition):
@pyfile
def code_to_debug():
import debug_me # noqa
import sys
for i in range(0, 10):
print(i * 10) # @bp
sys.stderr.write(str(i * 10) + "\n") # @bp
sys.stderr.flush()
() # @wait_for_output
lines = code_to_debug.lines
@ -215,7 +214,7 @@ def test_log_point(pyfile, start_method, run_as, condition):
session.request(
"setBreakpoints",
arguments={
{
"source": {"path": code_to_debug},
"breakpoints": [bp, {"line": lines["wait_for_output"]}],
},
@ -224,36 +223,34 @@ def test_log_point(pyfile, start_method, run_as, condition):
if condition:
session.wait_for_stop(
"breakpoint",
expected_frames=[
some.dap.frame(code_to_debug, line="bp")
],
"breakpoint", expected_frames=[some.dap.frame(code_to_debug, line="bp")]
)
var_i = session.get_variable("i")
assert var_i == some.dict.containing(
{"name": "i", "evaluateName": "i", "type": "int", "value": "5"},
{"name": "i", "evaluateName": "i", "type": "int", "value": "5"}
)
session.request_continue()
session.wait_for_stop(
"breakpoint",
expected_frames=[
some.dap.frame(code_to_debug, line="wait_for_output")
],
expected_frames=[some.dap.frame(code_to_debug, line="wait_for_output")],
)
session.request_continue()
assert not session.captured_stderr()
# print() should produce both actual output, and "output" events on stderr,
# but logpoints should only produce "output" events on stdout.
assert not session.captured_stdout()
expected_stdout = "".join(
(
fmt(r"{0}\r?\n{1}\r?\n", re.escape(str(i)), re.escape(str(i * 10)))
for i in range(0, 10)
)
(fmt(r"{0}\r?\n", re.escape(str(i))) for i in range(0, 10))
)
expected_stderr = "".join(
(fmt(r"{0}\r?\n", re.escape(str(i * 10))) for i in range(0, 10))
)
assert session.output("stdout") == some.str.matching(expected_stdout)
assert session.output("stderr") == some.str.matching(expected_stderr)
def test_package_launch():
@ -267,10 +264,7 @@ def test_package_launch():
session.start_debugging()
session.wait_for_stop(
"breakpoint",
expected_frames=[
some.dap.frame(test_py, line="two"),
],
"breakpoint", expected_frames=[some.dap.frame(test_py, line="two")]
)
session.request_continue()
@ -291,10 +285,7 @@ def test_add_and_remove_breakpoint(pyfile, start_method, run_as):
session.start_debugging()
session.wait_for_stop(
"breakpoint",
expected_frames=[
some.dap.frame(code_to_debug, line="bp"),
],
"breakpoint", expected_frames=[some.dap.frame(code_to_debug, line="bp")]
)
# Remove breakpoint inside the loop.
@ -303,9 +294,7 @@ def test_add_and_remove_breakpoint(pyfile, start_method, run_as):
session.wait_for_stop(
"breakpoint",
expected_frames=[
some.dap.frame(code_to_debug, line="wait_for_output")
],
expected_frames=[some.dap.frame(code_to_debug, line="wait_for_output")],
)
session.request_continue()
@ -314,23 +303,22 @@ def test_add_and_remove_breakpoint(pyfile, start_method, run_as):
def test_breakpoints_in_filtered_files(pyfile, run_as, start_method):
@pyfile
def code_to_debug():
import debug_me # noqa
import debug_me # noqa
with debug.Session(start_method) as session:
session.configure(run_as, code_to_debug)
breakpoints = session.set_breakpoints('invalid_file.py', [1])
assert breakpoints == [{
'verified': False,
'message': 'Breakpoint in file that does not exist.',
'source': some.dict.containing({
'path': some.path('invalid_file.py')
}),
'line': 1
}]
breakpoints = session.set_breakpoints("invalid_file.py", [1])
assert breakpoints == [
{
"verified": False,
"message": "Breakpoint in file that does not exist.",
"source": some.dict.containing({"path": some.path("invalid_file.py")}),
"line": 1,
}
]
session.start_debugging()