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 2

Just my code (#467)

Browse source 
* Add set debugger property to support VS just my code

* Just my code initial code

* Limit continue to stepping and exceptions

* Improve skipping non-user code

* Fix tests

* Just my code shoudl skip ptvsd files

* fixes and updates (#1)

* Fix typo

* Use CMD_STEP_INTO_MY_CODE and CMD_SET_PROJECT_ROOTS

* Update tests to reflect the new pydevd exception breakpoint cmd args

* Fixes and improvements

* Simplify and refactor debug options

* Test fix and fix for debug property request handler for VS

* More fixes

* Test fixes

* Address comments

* Bunch of test fixes (#2)

* Test fixes

* Restoring auto-continue till pydev side work is done.
This commit is contained in:
Karthik Nadig 2018-06-14 11:02:38 -07:00 • committed by GitHub
parent 8427816fca
commit bbeebea696
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 208 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/highlevel/__init__.py
View file

@ -17,6 +17,7 @@ from _pydevd_bundle.pydevd_comm import (
CMD_SEND_CURR_EXCEPTION_TRACE,
CMD_THREAD_CREATE,
CMD_GET_VARIABLE,
CMD_SET_PROJECT_ROOTS,
)
from ptvsd import wrapper
@ -139,8 +140,9 @@ class PyDevdLifecycle(object):
@contextlib.contextmanager
def _wait_for_initialized(self):
with self._fix.wait_for_command(CMD_REDIRECT_OUTPUT):
with self._fix.wait_for_command(CMD_RUN):
yield
with self._fix.wait_for_command(CMD_SET_PROJECT_ROOTS):
with self._fix.wait_for_command(CMD_RUN):
yield
def _initialize(self):
version = self._fix.fake.VERSION

19
tests/highlevel/test_lifecycle.py
View file

@ -7,6 +7,7 @@ from _pydevd_bundle.pydevd_comm import (
CMD_REDIRECT_OUTPUT,
CMD_RUN,
CMD_VERSION,
CMD_SET_PROJECT_ROOTS,
)
from . import (
@ -25,6 +26,17 @@ from ptvsd.wrapper import INITIALIZE_RESPONSE
# * sending an "exit" event.
def _get_project_dirs():
cwd = os.getcwd()
pyd_path = os.path.join('ptvsd', '_vendored', 'pydevd')
paths = []
if cwd.endswith('ptvsd') or \
cwd.endswith(pyd_path):
return ''
paths.append(cwd)
return '\t'.join(paths)
class LifecycleTests(HighlevelTest, unittest.TestCase):
"""
See https://code.visualstudio.com/docs/extensionAPI/api-debugging#_the-vs-code-debug-protocol-in-a-nutshell
@ -86,6 +98,8 @@ class LifecycleTests(HighlevelTest, unittest.TestCase):
self.debugger_msgs.new_request(CMD_VERSION,
*['1.1', expected_os_id, 'ID']),
self.debugger_msgs.new_request(CMD_REDIRECT_OUTPUT),
self.debugger_msgs.new_request(CMD_SET_PROJECT_ROOTS,
_get_project_dirs()),
self.debugger_msgs.new_request(CMD_RUN),
])
@ -116,7 +130,8 @@ class LifecycleTests(HighlevelTest, unittest.TestCase):
# configuration
req_config = self.send_request('configurationDone')
self.wait_for_pydevd('version', 'redirect-output', 'run')
self.wait_for_pydevd('version', 'redirect-output',
'run', 'set_project_roots')
# Normal ops would go here.
@ -148,5 +163,7 @@ class LifecycleTests(HighlevelTest, unittest.TestCase):
self.debugger_msgs.new_request(CMD_VERSION,
*['1.1', OS_ID, 'ID']),
self.debugger_msgs.new_request(CMD_REDIRECT_OUTPUT),
self.debugger_msgs.new_request(CMD_SET_PROJECT_ROOTS,
_get_project_dirs()),
self.debugger_msgs.new_request(CMD_RUN),
])

87
tests/highlevel/test_messages.py
View file

@ -29,6 +29,7 @@ from _pydevd_bundle.pydevd_comm import (
CMD_THREAD_RUN,
CMD_THREAD_SUSPEND,
CMD_WRITE_TO_CONSOLE,
CMD_STEP_INTO_MY_CODE,
)
from . import RunningTest
@ -810,7 +811,7 @@ class NextTests(NormalRequestTest, unittest.TestCase):
class StepInTests(NormalRequestTest, unittest.TestCase):
COMMAND = 'stepIn'
PYDEVD_CMD = CMD_STEP_INTO
PYDEVD_CMD = CMD_STEP_INTO_MY_CODE
PYDEVD_RESP = None
def test_basic(self):
@ -1454,7 +1455,11 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
# TODO: We've hard-coded the currently supported modes. If other
# modes are added later then we need to add more tests. We don't
# have a programatic alternative that is very readable.
# have a programmatic alternative that is very readable.
# NOTE: The mode here depends on the default value of DEBUG_STDLIB.
# When this test was written it was assumed the DEBUG_STDLIB = False.
# this means ignore_stdlib arg to pydevd must be 1
def test_single_option_single_path_mode_never(self):
path = {
@ -1463,7 +1468,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
self._check_option(
[path],
'never',
['python-BaseException\t0\t0\t0'],
['python-BaseException\t0\t0\t1'],
)
def test_single_option_single_path_mode_always(self):
@ -1473,7 +1478,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
self._check_option(
[path],
'always',
['python-BaseException\t3\t0\t0'],
['python-BaseException\t1\t0\t1'],
)
def test_single_option_single_path_mode_unhandled(self):
@ -1483,7 +1488,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
self._check_option(
[path],
'unhandled',
['python-BaseException\t0\t1\t0'],
['python-BaseException\t0\t1\t1'],
)
def test_single_option_single_path_mode_userUnhandled(self):
@ -1493,7 +1498,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
self._check_option(
[path],
'userUnhandled',
['python-BaseException\t0\t1\t0'],
['python-BaseException\t0\t1\t1'],
)
def test_single_option_empty_paths(self):
@ -1533,7 +1538,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
self._check_option(
[path],
'always',
['python-BaseException\t3\t0\t0'],
['python-BaseException\t3\t0\t1'],
)
def test_single_option_shallow_path(self):
@ -1542,7 +1547,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
{'names': ['ImportError']},
]
self._check_option(path, 'always', [
'python-ImportError\t3\t0\t0',
'python-ImportError\t1\t0\t1',
])
def test_single_option_deep_path(self):
@ -1554,10 +1559,10 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
{'names': ['MyError']},
]
self._check_option(path, 'always', [
'python-ImportError\t3\t0\t0',
'python-RuntimeError\t3\t0\t0',
'python-ValueError\t3\t0\t0',
'python-MyError\t3\t0\t0',
'python-ImportError\t1\t0\t1',
'python-RuntimeError\t1\t0\t1',
'python-ValueError\t1\t0\t1',
'python-MyError\t1\t0\t1',
])
# TODO: verify behavior
@ -1568,9 +1573,9 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
{'names': ['ImportError', 'RuntimeError', 'ValueError']},
]
self._check_option(path, 'always', [
'python-ImportError\t3\t0\t0',
'python-RuntimeError\t3\t0\t0',
'python-ValueError\t3\t0\t0',
'python-ImportError\t1\t0\t1',
'python-RuntimeError\t1\t0\t1',
'python-ValueError\t1\t0\t1',
])
# TODO: verify behavior
@ -1631,17 +1636,17 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
]
self._check_options(options, [
# shallow path
'python-ImportError\t3\t0\t0',
'python-ImportError\t1\t0\t1',
# ignored
# deep path
'python-ModuleNotFoundError\t0\t1\t0',
'python-RuntimeError\t0\t1\t0',
'python-MyError\t0\t1\t0',
'python-ModuleNotFoundError\t0\t1\t1',
'python-RuntimeError\t0\t1\t1',
'python-MyError\t0\t1\t1',
# multiple names
'python-ValueError\t0\t0\t0',
'python-IndexError\t0\t0\t0',
'python-ValueError\t0\t0\t1',
'python-IndexError\t0\t0\t1',
# catch-all
'python-BaseException\t0\t1\t0',
'python-BaseException\t0\t1\t1',
])
def test_options_with_existing_filters(self):
@ -1649,7 +1654,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
with self.hidden():
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
p1 = self.expected_pydevd_request(
'python-BaseException\t0\t1\t0',
'python-BaseException\t0\t1\t1',
)
self.fix.send_request('setExceptionBreakpoints', dict(
filters=[
@ -1683,8 +1688,8 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
]
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, removed + [
self.expected_pydevd_request('python-ImportError\t0\t0\t0'),
self.expected_pydevd_request('python-RuntimeError\t3\t0\t0'),
self.expected_pydevd_request('python-ImportError\t0\t0\t1'),
self.expected_pydevd_request('python-RuntimeError\t1\t0\t1'),
])
def test_options_with_existing_options(self):
@ -1692,10 +1697,10 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
with self.hidden():
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
p1 = self.expected_pydevd_request(
'python-ImportError\t0\t1\t0',
'python-ImportError\t0\t1\t1',
)
p2 = self.expected_pydevd_request(
'python-BaseException\t3\t0\t0',
'python-BaseException\t1\t0\t1',
)
self.fix.send_request('setExceptionBreakpoints', dict(
filters=[],
@ -1745,8 +1750,8 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
]
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, removed + [
self.expected_pydevd_request('python-ImportError\t0\t0\t0'),
self.expected_pydevd_request('python-RuntimeError\t0\t1\t0'),
self.expected_pydevd_request('python-ImportError\t0\t0\t1'),
self.expected_pydevd_request('python-RuntimeError\t0\t1\t1'),
])
# TODO: As with the option modes, we've hard-coded the filters
@ -1767,7 +1772,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
])
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, [
self.expected_pydevd_request('python-BaseException\t3\t0\t0'),
self.expected_pydevd_request('python-BaseException\t1\t0\t1'),
])
def test_single_filter_uncaught(self):
@ -1784,7 +1789,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
])
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, [
self.expected_pydevd_request('python-BaseException\t0\t1\t0'),
self.expected_pydevd_request('python-BaseException\t0\t1\t1'),
])
def test_multiple_filters_all(self):
@ -1802,7 +1807,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
])
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, [
self.expected_pydevd_request('python-BaseException\t3\t1\t0'),
self.expected_pydevd_request('python-BaseException\t1\t1\t1'),
])
def test_multiple_filters_repeat(self):
@ -1820,7 +1825,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
])
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, [
self.expected_pydevd_request('python-BaseException\t3\t0\t0'),
self.expected_pydevd_request('python-BaseException\t1\t0\t1'),
])
def test_empty_filters(self):
@ -1840,7 +1845,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
with self.hidden():
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
p1 = self.expected_pydevd_request(
'python-BaseException\t0\t1\t0',
'python-BaseException\t0\t1\t1',
)
self.fix.send_request('setExceptionBreakpoints', dict(
filters=[
@ -1864,7 +1869,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
]
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, removed + [
self.expected_pydevd_request('python-BaseException\t3\t0\t0'),
self.expected_pydevd_request('python-BaseException\t1\t0\t1'),
])
def test_filters_with_existing_options(self):
@ -1872,10 +1877,10 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
with self.hidden():
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
p1 = self.expected_pydevd_request(
'python-ImportError\t0\t1\t0',
'python-ImportError\t0\t1\t1',
)
p2 = self.expected_pydevd_request(
'python-BaseException\t3\t0\t0',
'python-BaseException\t1\t0\t1',
)
self.fix.send_request('setExceptionBreakpoints', dict(
filters=[],
@ -1915,7 +1920,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
]
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, removed + [
self.expected_pydevd_request('python-BaseException\t3\t0\t0'),
self.expected_pydevd_request('python-BaseException\t1\t0\t1'),
])
def test_filters_with_empty_options(self):
@ -1933,7 +1938,7 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
])
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, [
self.expected_pydevd_request('python-BaseException\t3\t0\t0'),
self.expected_pydevd_request('python-BaseException\t1\t0\t1'),
])
# TODO: verify behavior
@ -1959,8 +1964,8 @@ class SetExceptionBreakpointsTests(NormalRequestTest, unittest.TestCase):
])
self.PYDEVD_CMD = CMD_ADD_EXCEPTION_BREAK
self.assert_received(self.debugger, [
'python-BaseException\t3\t0\t0',
'python-ImportError\t0\t1\t0',
'python-BaseException\t1\t0\t1',
'python-ImportError\t0\t1\t1',
])

19
tests/ptvsd/test_internals_filter.py
View file

@ -3,7 +3,7 @@ import unittest
import ptvsd.untangle
from ptvsd.wrapper import InternalsFilter
from ptvsd.wrapper import filter_ptvsd_files
from ptvsd.wrapper import dont_trace_ptvsd_files
class InternalsFilterTests(unittest.TestCase):
@ -34,12 +34,15 @@ class InternalsFilterTests(unittest.TestCase):
class PtvsdFileTraceFilter(unittest.TestCase):
def test_basic(self):
internal_dir = os.path.dirname(
os.path.abspath(ptvsd.untangle.__file__))
test_paths = {
os.path.join('C:', 'ptvsd', 'wrapper.py'): True,
os.path.join('C:', 'abcd', 'ptvsd', 'wrapper.py'): True,
os.path.join('usr', 'ptvsd', 'wrapper.py'): True,
os.path.join('ptvsd', 'wrapper.py'): True,
os.path.join('usr', 'abcd', 'ptvsd', 'wrapper.py'): True,
os.path.join(internal_dir, 'wrapper.py'): True,
os.path.join(internal_dir, 'abcd', 'ptvsd', 'wrapper.py'): True,
os.path.join(internal_dir, 'ptvsd', 'wrapper.py'): True,
os.path.join(internal_dir, 'abcd', 'wrapper.py'): True,
os.path.join('usr', 'abcd', 'ptvsd', 'wrapper.py'): False,
os.path.join('C:', 'ptvsd', 'wrapper1.py'): False,
os.path.join('C:', 'abcd', 'ptvsd', 'ptvsd.py'): False,
os.path.join('usr', 'ptvsd', 'w.py'): False,
@ -48,4 +51,6 @@ class PtvsdFileTraceFilter(unittest.TestCase):
}
for path, val in test_paths.items():
self.assertTrue(val == filter_ptvsd_files(path))
self.assertTrue(val == dont_trace_ptvsd_files(path),
msg='Path : %s\nActual: %s' % (path,
internal_dir))