Skip to content

Commit 4ef7397

Browse files
committed
Upgrade debugpy
Latest Debugpy no longer works properly with multiprocessing on macOS, so disable that test for now.
1 parent 3649e89 commit 4ef7397

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

python3/vimspector/gadgets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
'url': 'https://github.com/microsoft/debugpy/archive/${file_name}'
113113
},
114114
'all': {
115-
'version': '1.8.1',
116-
'file_name': 'v1.8.1.zip',
115+
'version': '1.8.11',
116+
'file_name': 'v1.8.11.zip',
117117
'checksum':
118118
''
119119
},

tests/child_sessions.test.vim

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ function! s:StartDebugging( ... )
3131
endfunction
3232

3333
function! Test_Python_MultiProcessing()
34-
" For some reason the 'fork' mp style causes crashes in debugpy at least on
35-
" macOS (but only when using neovim!). And for the tests to be stable, we need
36-
" to ensure there's only 1 child launched. With the default 'launch' behaviour
37-
" of multiprocessing, we get arbitrary ordering for the additional watchdog
38-
" chld process
39-
call SkipNeovim()
34+
" For some reason, fork style multiprocessing debugging no longer works on
35+
" macOS properly. Breakpoints are hit, but step/next requests don't work
36+
" correctly
37+
call SkipOn( v:null, 'Darwin' )
4038
call s:StartDebugging()
4139

4240
call WaitForAssert( {->

tests/lib/plugin/shared.vim

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,19 @@ function! SkipNeovim() abort
157157
endfunction
158158

159159
function! SkipOn( arch, system ) abort
160-
if trim( system( 'uname -m' ) ) == a:arch &&
161-
\ trim( system( 'uname -s' ) ) == a:system
162-
throw 'skipped: Not on this architecture'
160+
if a:arch != v:null && trim( system( 'uname -m' ) ) != a:arch
161+
return
163162
endif
163+
164+
if a:system != v:null && trim( system( 'uname -s' ) ) != a:system
165+
return
166+
endif
167+
168+
throw 'skipped: Not on this architecture/platform ('
169+
\ . a:arch
170+
\ . '/'
171+
\ . a:system .
172+
\ ')'
164173
endfunction
165174

166175
function! SkipIf( f, msg ) abort

0 commit comments

Comments
 (0)