Update tests to support showReturnValue setting

Author: karthiknadig

src/test/debugger/configProvider/provider.unit.test.ts

@@ -270,8 +270,9 @@ suite('Debugging - Config Provider', () => {
 
  expect(debugConfig).to.have.property('console', 'integratedTerminal');
  expect(debugConfig).to.have.property('stopOnEntry', false);
+ expect(debugConfig).to.have.property('showReturnValue', false);
  expect(debugConfig).to.have.property('debugOptions');
- expect((debugConfig as any).debugOptions).to.be.deep.equal(['RedirectOutput']);
+ expect((debugConfig as any).debugOptions).to.be.deep.equal([DebugOptions.RedirectOutput]);
  });
  test('Test defaults of python debugger', async () => {
  if ('python' === DebuggerTypeName) {
@@ -286,6 +287,7 @@ suite('Debugging - Config Provider', () => {
  const debugConfig = await debugProvider.resolveDebugConfiguration!(workspaceFolder, {} as DebugConfiguration);
 
  expect(debugConfig).to.have.property('stopOnEntry', false);
+ expect(debugConfig).to.have.property('showReturnValue', false);
  expect(debugConfig).to.have.property('debugOptions');
  expect((debugConfig as any).debugOptions).to.be.deep.equal([DebugOptions.RedirectOutput]);
  });
@@ -300,6 +302,7 @@ suite('Debugging - Config Provider', () => {
 
  expect(debugConfig).to.have.property('console', 'integratedTerminal');
  expect(debugConfig).to.have.property('stopOnEntry', false);
+ expect(debugConfig).to.have.property('showReturnValue', false);
  expect(debugConfig).to.have.property('debugOptions');
  expect((debugConfig as any).debugOptions).to.be.deep.equal([]);
  });

src/test/debugger/misc.test.ts

@@ -56,13 +56,14 @@ suite(`Standard Debugging - Misc tests: ${debuggerType}`, () => {
  return new DebugClientEx(testAdapterFilePath, debuggerType, coverageDirectory, { cwd: EXTENSION_ROOT_DIR });
  }
  }
- function buildLaunchArgs(pythonFile: string, stopOnEntry: boolean = false): LaunchRequestArguments {
+ function buildLaunchArgs(pythonFile: string, stopOnEntry: boolean = false, showReturnValue: boolean = false): LaunchRequestArguments {
  const env = { PYTHONPATH: PTVSD_PATH };
  // tslint:disable-next-line:no-unnecessary-local-variable
  const options = {
  program: path.join(debugFilesPath, pythonFile),
  cwd: debugFilesPath,
  stopOnEntry,
+ showReturnValue,
  debugOptions: [DebugOptions.RedirectOutput],
  pythonPath: PYTHON_PATH,
  args: [],

src/test/debugger/portAndHost.test.ts

@@ -44,11 +44,12 @@ suite(`Standard Debugging of ports and hosts: ${debuggerType}`, () => {
  } catch (ex) { }
  });
 
- function buildLauncArgs(pythonFile: string, stopOnEntry: boolean = false, port?: number, host?: string): LaunchRequestArguments {
+ function buildLaunchArgs(pythonFile: string, stopOnEntry: boolean = false, port?: number, host?: string, showReturnValue: boolean = false): LaunchRequestArguments {
  return {
  program: path.join(debugFilesPath, pythonFile),
  cwd: debugFilesPath,
  stopOnEntry,
+ showReturnValue,
  logToFile: true,
  debugOptions: [DebugOptions.RedirectOutput],
  pythonPath: PYTHON_PATH,
@@ -64,7 +65,7 @@ suite(`Standard Debugging of ports and hosts: ${debuggerType}`, () => {
  async function testDebuggingWithProvidedPort(port?: number | undefined, host?: string | undefined) {
  await Promise.all([
  debugClient.configurationSequence(),
- debugClient.launch(buildLauncArgs('startAndWait.py', false, port, host)),
+ debugClient.launch(buildLaunchArgs('startAndWait.py', false, port, host)),
  debugClient.waitForEvent('initialized')
  ]);
 

src/test/debugger/run.test.ts

@@ -40,12 +40,13 @@ suite('Run without Debugging', () => {
  } catch (ex) { }
  await sleep(1000);
  });
- function buildLauncArgs(pythonFile: string, stopOnEntry: boolean = false): LaunchRequestArguments {
+ function buildLaunchArgs(pythonFile: string, stopOnEntry: boolean = false, showReturnValue: boolean = false): LaunchRequestArguments {
  // tslint:disable-next-line:no-unnecessary-local-variable
  return {
  program: path.join(debugFilesPath, pythonFile),
  cwd: debugFilesPath,
  stopOnEntry,
+ showReturnValue,
  noDebug: true,
  debugOptions: [DebugOptions.RedirectOutput],
  pythonPath: PYTHON_PATH,
@@ -62,15 +63,15 @@ suite('Run without Debugging', () => {
  test('Should run program to the end', async () => {
  await Promise.all([
  debugClient.configurationSequence(),
- debugClient.launch(buildLauncArgs('simplePrint.py', false)),
+ debugClient.launch(buildLaunchArgs('simplePrint.py', false)),
  debugClient.waitForEvent('initialized'),
  debugClient.waitForEvent('terminated')
  ]);
  });
  test('test stderr output for Python', async () => {
  await Promise.all([
  debugClient.configurationSequence(),
- debugClient.launch(buildLauncArgs('stdErrOutput.py', false)),
+ debugClient.launch(buildLaunchArgs('stdErrOutput.py', false)),
  debugClient.waitForEvent('initialized'),
  debugClient.assertOutput('stderr', 'error output'),
  debugClient.waitForEvent('terminated')
@@ -79,7 +80,7 @@ suite('Run without Debugging', () => {
  test('Test stdout output', async () => {
  await Promise.all([
  debugClient.configurationSequence(),
- debugClient.launch(buildLauncArgs('stdOutOutput.py', false)),
+ debugClient.launch(buildLaunchArgs('stdOutOutput.py', false)),
  debugClient.waitForEvent('initialized'),
  debugClient.assertOutput('stdout', 'normal output'),
  debugClient.waitForEvent('terminated')
@@ -102,7 +103,7 @@ suite('Run without Debugging', () => {
  });
  await Promise.all([
  debugClient.configurationSequence(),
- debugClient.launch(buildLauncArgs('sampleWithSleep.py', false)),
+ debugClient.launch(buildLaunchArgs('sampleWithSleep.py', false)),
  debugClient.waitForEvent('initialized'),
  processIdOutput
  ]);