@@ -56,7 +56,7 @@ suite('Attach Debugger - Experimental', () => {
56
56
57
57
// Set the path for PTVSD to be picked up.
58
58
// tslint:disable-next-line:no-string-literal
59
- customEnv [ 'PYTHONPATH' ] = '/home/don/Desktop/development/vscode/ptvsd' ;
59
+ customEnv [ 'PYTHONPATH' ] = ptvsdPath ;
60
60
const pythonArgs = [ '-m' , 'ptvsd' , '--server' , '--port' , `${ port } ` , '--file' , fileToDebug ] ;
61
61
procToKill = spawn ( 'python' , pythonArgs , { env : customEnv , cwd : path . dirname ( fileToDebug ) } ) ;
62
62
// wait for remote socket to start
@@ -116,9 +116,7 @@ suite('Attach Debugger - Experimental', () => {
116
116
stdOutPromise , stdErrPromise
117
117
] ) ;
118
118
119
- // Unfortunately PTVSD will be running on the current OS, hence paths will be concatenated using current OS path separator.
120
- const expectedBreapointFile = path . join ( localRoot , path . basename ( fileToDebug ) ) ;
121
- await debugClient . assertStoppedLocation ( 'breakpoint' , { path : expectedBreapointFile , column : 1 , line : 12 } ) ;
119
+ await debugClient . assertStoppedLocation ( 'breakpoint' , breakpointLocation ) ;
122
120
123
121
await Promise . all ( [
124
122
continueDebugging ( debugClient ) ,
@@ -136,7 +134,7 @@ suite('Attach Debugger - Experimental', () => {
136
134
137
135
await testAttachingToRemoteProcess ( path . dirname ( fileToDebug ) , path . dirname ( fileToDebug ) , path . sep ) ;
138
136
} ) ;
139
- test ( 'Confirm localpath translations are done correctly ' , async function ( ) {
137
+ test ( 'Confirm local and remote paths are translated ' , async function ( ) {
140
138
this . timeout ( 20000 ) ;
141
139
this . retries ( 0 ) ;
142
140
// Lets skip this test on AppVeyor (very flaky on AppVeyor).
@@ -145,7 +143,7 @@ suite('Attach Debugger - Experimental', () => {
145
143
}
146
144
147
145
const localWorkspace = IS_WINDOWS ? '/home/user/Desktop/project/src' : 'C:\\Project\\src' ;
148
- const pathSeparator = IS_WINDOWS ? '\\ ' : '/ ' ;
146
+ const pathSeparator = IS_WINDOWS ? '/ ' : '\\ ' ;
149
147
await testAttachingToRemoteProcess ( localWorkspace , path . dirname ( fileToDebug ) , pathSeparator ) ;
150
148
} ) ;
151
149
} ) ;
0 commit comments