Fix for a bunch of tests.

Author: karthiknadig

news/2 Fixes/17280.md

@@ -0,0 +1 @@
+Fix for unable to import when running unittest.

news/2 Fixes/17285.md

@@ -0,0 +1 @@
+Improve detecting lines when using testing wrappers.

news/2 Fixes/17309.md

@@ -0,0 +1 @@
+Missing location info for `async def` functions.

pythonFiles/testing_tools/unittest_discovery.py

@@ -0,0 +1,59 @@
+import unittest
+import inspect
+import sys
+import traceback
+
+start_dir = sys.argv[1]
+pattern = sys.argv[2]
+
+def get_sourceline(obj):
+ try:
+ s, n = inspect.getsourcelines(obj)
+ except:
+ try:
+ # this handles `tornado` case we need a better
+ # way to get to the wrapped function.
+ # This is a temporary solution
+ s, n = inspect.getsourcelines(obj.orig_method)
+ except:
+ return '*'
+
+ for i, v in enumerate(s):
+ if v.strip().startswith(('def', 'async def')):
+ return str(n+i)
+ return '*'
+
+def generate_test_cases(suite):
+ for test in suite:
+ if isinstance(test, unittest.TestCase):
+ yield test
+ else:
+ for test_case in generate_test_cases(test):
+ yield test_case
+try:
+ loader = unittest.TestLoader()
+ suite = loader.discover(start_dir, pattern=pattern)
+
+
+ print("start") # Don't remove this line
+ loader_errors = []
+ for s in generate_test_cases(suite):
+ tm = getattr(s, s._testMethodName)
+ testId = s.id()
+ if testId.startswith("unittest.loader._FailedTest"):
+ loader_errors.append(s._exception)
+ else:
+ print(testId.replace(".", ":") + ":" + get_sourceline(tm))
+except:
+ print("=== exception start ===")
+ traceback.print_exc()
+ print("=== exception end ===")
+
+
+for error in loader_errors:
+ try:
+ print("=== exception start ===")
+ print(error.msg)
+ print("=== exception end ===")
+ except:
+ pass

src/client/common/process/internal/scripts/testing_tools.ts

@@ -11,8 +11,10 @@ const SCRIPTS_DIR = path.join(_SCRIPTS_DIR, 'testing_tools');
 
 export function runAdapter(adapterArgs: string[]): string[] {
  const script = path.join(SCRIPTS_DIR, 'run_adapter.py');
- // Note that we for now we do not run this "isolated". The
- // script relies on some magic that conflicts with the
- // isolated script.
  return [script, ...adapterArgs];
 }
+
+export function unittestDiscovery(args: string[]): string[] {
+ const script = path.join(SCRIPTS_DIR, 'unittest_discovery.py');
+ return [script, ...args];
+}

src/client/testing/testController/unittest/unittestController.ts

@@ -20,7 +20,6 @@ import {
  TestData,
 } from '../common/types';
 import { unittestGetTestFolders, unittestGetTestPattern } from './arguments';
-import { execCode } from '../../../common/process/internal/python';
 import {
  createErrorTestItem,
  createWorkspaceRootTestItem,
@@ -31,6 +30,7 @@ import {
 import { traceError } from '../../../common/logger';
 import { sendTelemetryEvent } from '../../../telemetry';
 import { EventName } from '../../../telemetry/constants';
+import { unittestDiscovery } from '../../../common/process/internal/scripts/testing_tools';
 
 @injectable()
 export class UnittestController implements ITestFrameworkController {
@@ -111,51 +111,16 @@ export class UnittestController implements ITestFrameworkController {
 
  const startDir = unittestGetTestFolders(options.args)[0];
  const pattern = unittestGetTestPattern(options.args);
- const discoveryScript = `
-import unittest
-import inspect
-
-def get_sourceline(obj):
- s, n = inspect.getsourcelines(obj)
- for i, v in enumerate(s):
- if v.strip().startswith('def'):
- return str(n+i)
- return '*'
-
-def generate_test_cases(suite):
- for test in suite:
- if isinstance(test, unittest.TestCase):
- yield test
- else:
- for test_case in generate_test_cases(test):
- yield test_case
-
-loader = unittest.TestLoader()
-suite = loader.discover("${startDir}", pattern="${pattern}")
-
-print("start") # Don't remove this line
-loader_errors = []
-for s in generate_test_cases(suite):
- tm = getattr(s, s._testMethodName)
- testId = s.id()
- if testId.startswith("unittest.loader._FailedTest"):
- loader_errors.append(s._exception)
- else:
- print(testId.replace(".", ":") + ":" + get_sourceline(tm))
-
-for error in loader_errors:
- try:
- print("=== exception start ===")
- print(error.msg)
- print("=== exception end ===")
- except:
- pass
-`;
+ let testDir = startDir;
+ if (path.isAbsolute(startDir)) {
+ const relative = path.relative(options.cwd, startDir);
+ testDir = relative.length > 0 ? relative : '.';
+ }
 
  const runOptions: Options = {
  // unittest needs to load modules in the workspace
  // isolating it breaks unittest discovery
- args: execCode(discoveryScript),
+ args: unittestDiscovery([startDir, pattern]),
  cwd: options.cwd,
  workspaceFolder: options.workspaceFolder,
  token: options.token,
@@ -168,12 +133,7 @@ for error in loader_errors:
  let rawTestData: RawDiscoveredTests | undefined;
  try {
  const content = await this.discoveryRunner.run(UNITTEST_PROVIDER, runOptions);
- rawTestData = await testDiscoveryParser(
- options.cwd,
- path.isAbsolute(startDir) ? path.relative(options.cwd, startDir) : startDir,
- getTestIds(content),
- options.token,
- );
+ rawTestData = await testDiscoveryParser(options.cwd, testDir, getTestIds(content), options.token);
  this.testData.set(workspace.uri.fsPath, rawTestData);
 
  const exceptions = getTestDiscoveryExceptions(content);