Skip to content

Commit

Permalink
Add even more logging for #192584 (#193036)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdima committed Sep 13, 2023
1 parent 2c52e4c commit 1edc9a7
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/vs/workbench/api/common/extHostExtensionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -740,8 +740,18 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
return new Promise<number>((resolve, reject) => {
const oldTestRunnerCallback = (error: Error, failures: number | undefined) => {
if (error) {
if (isCI) {
this._logService.error(`Test runner called back with error`, error);
}
reject(error);
} else {
if (isCI) {
if (failures) {
this._logService.info(`Test runner called back with ${failures} failures.`);
} else {
this._logService.info(`Test runner called back with successful outcome.`);
}
}
resolve((typeof failures === 'number' && failures > 0) ? 1 /* ERROR */ : 0 /* OK */);
}
};
Expand All @@ -754,9 +764,15 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
if (runResult && runResult.then) {
runResult
.then(() => {
if (isCI) {
this._logService.info(`Test runner finished successfully.`);
}
resolve(0);
})
.catch((err: unknown) => {
if (isCI) {
this._logService.error(`Test runner finished with error`, err);
}
reject(err instanceof Error && err.stack ? err.stack : String(err));
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,13 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
let exitCode: number;
try {
exitCode = await extensionHostManager.extensionTestsExecute();
if (isCI) {
this._logService.info(`Extension host test runner exit code: ${exitCode}`);
}
} catch (err) {
if (isCI) {
this._logService.error(`Extension host test runner error`, err);
}
console.error(err);
exitCode = 1 /* ERROR */;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,9 @@ export class NativeExtensionService extends AbstractExtensionService implements

if (parseExtensionDevOptions(this._environmentService).isExtensionDevTestFromCli) {
// When CLI testing make sure to exit with proper exit code
if (isCI) {
this._logService.info(`Asking native host service to exit with code ${code}.`);
}
this._nativeHostService.exit(code);
} else {
// Expected development extension termination: When the extension host goes down we also shutdown the window
Expand Down

0 comments on commit 1edc9a7

Please sign in to comment.