From 4a6382ab4975c9e4a9c7ae1cf3cb95ecd3ade4bd Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 28 Jan 2019 17:01:41 -0800 Subject: [PATCH 1/2] Remove '--file' from PTVSD CLI in tests --- src/test/debugger/attach.ptvsd.test.ts | 2 +- src/test/debugger/capabilities.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/debugger/attach.ptvsd.test.ts b/src/test/debugger/attach.ptvsd.test.ts index de7a7811e102..900d9fb0d8ff 100644 --- a/src/test/debugger/attach.ptvsd.test.ts +++ b/src/test/debugger/attach.ptvsd.test.ts @@ -61,7 +61,7 @@ suite('Debugging - Attach Debugger', () => { // Set the path for PTVSD to be picked up. // tslint:disable-next-line:no-string-literal env['PYTHONPATH'] = PTVSD_PATH; - const pythonArgs = ['-m', 'ptvsd', '--host', 'localhost', '--wait', '--port', `${port}`, '--file', fileToDebug.fileToCommandArgument()]; + const pythonArgs = ['-m', 'ptvsd', '--host', 'localhost', '--wait', '--port', `${port}`, fileToDebug.fileToCommandArgument()]; proc = spawn(PYTHON_PATH, pythonArgs, { env: env, cwd: path.dirname(fileToDebug) }); const exited = new Promise(resolve => proc.once('close', resolve)); await sleep(3000); diff --git a/src/test/debugger/capabilities.test.ts b/src/test/debugger/capabilities.test.ts index eef8ecca7347..a25d2723c3a1 100644 --- a/src/test/debugger/capabilities.test.ts +++ b/src/test/debugger/capabilities.test.ts @@ -89,7 +89,7 @@ suite('Debugging - Capabilities', function () { const port = await getFreePort({ host, port: 3000 }); const env = { ...process.env }; env.PYTHONPATH = PTVSD_PATH; - proc = spawn(PYTHON_PATH, ['-m', 'ptvsd', '--host', 'localhost', '--wait', '--port', `${port}`, '--file', fileToDebug], { cwd: path.dirname(fileToDebug), env }); + proc = spawn(PYTHON_PATH, ['-m', 'ptvsd', '--host', 'localhost', '--port', `${port}`, '--wait', fileToDebug], { cwd: path.dirname(fileToDebug), env }); await sleep(3000); const connected = createDeferred(); From e57c3d25e04ac93e0913b8a7c6b8a7aeb4938535 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 28 Jan 2019 17:03:50 -0800 Subject: [PATCH 2/2] Revert unneccessary change --- src/test/debugger/capabilities.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/debugger/capabilities.test.ts b/src/test/debugger/capabilities.test.ts index a25d2723c3a1..3e45655c22d7 100644 --- a/src/test/debugger/capabilities.test.ts +++ b/src/test/debugger/capabilities.test.ts @@ -89,7 +89,7 @@ suite('Debugging - Capabilities', function () { const port = await getFreePort({ host, port: 3000 }); const env = { ...process.env }; env.PYTHONPATH = PTVSD_PATH; - proc = spawn(PYTHON_PATH, ['-m', 'ptvsd', '--host', 'localhost', '--port', `${port}`, '--wait', fileToDebug], { cwd: path.dirname(fileToDebug), env }); + proc = spawn(PYTHON_PATH, ['-m', 'ptvsd', '--host', 'localhost', '--wait', '--port', `${port}`, fileToDebug], { cwd: path.dirname(fileToDebug), env }); await sleep(3000); const connected = createDeferred();