Smoke: only signal restored phase when contributions have executed (fix microsoft#199577)

Author: bpasero

src/vs/workbench/common/contributions.ts

@@ -44,6 +44,12 @@ export interface IWorkbenchContributionsRegistry {
 	 * Starts the registry by providing the required services.
 	 */
 	start(accessor: ServicesAccessor): void;
+
+	/**
+	 * A promise that resolves when all contributions up to the `Restored`
+	 * phase have been instantiated.
+	 */
+	readonly whenRestored: Promise<void>;
 }
 
 class WorkbenchContributionsRegistry implements IWorkbenchContributionsRegistry {
@@ -54,7 +60,9 @@ class WorkbenchContributionsRegistry implements IWorkbenchContributionsRegistry
 	private environmentService: IEnvironmentService | undefined;
 
 	private readonly contributions = new Map<LifecyclePhase, IConstructorSignature<IWorkbenchContribution>[]>();
+
 	private readonly pendingRestoredContributions = new DeferredPromise<void>();
+	readonly whenRestored = this.pendingRestoredContributions.p;
 
 	registerWorkbenchContribution(contribution: IConstructorSignature<IWorkbenchContribution>, phase: LifecyclePhase = LifecyclePhase.Starting): void {
 

src/vs/workbench/services/driver/browser/driver.ts

@@ -12,6 +12,9 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import localizedStrings from 'vs/platform/languagePacks/common/localizedStrings';
 import { ILogFile, getLogs } from 'vs/platform/log/browser/log';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IWindowDriver, IElement, ILocaleInfo, ILocalizedStrings } from 'vs/workbench/services/driver/common/driver';
 import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
@@ -21,15 +24,20 @@ export class BrowserWindowDriver implements IWindowDriver {
 		@IFileService private readonly fileService: IFileService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@ILogService private readonly logService: ILogService
 	) {
 	}
 
 	async getLogs(): Promise<ILogFile[]> {
 		return getLogs(this.fileService, this.environmentService);
 	}
 
-	whenWorkbenchRestored(): Promise<void> {
-		return this.lifecycleService.when(LifecyclePhase.Restored);
+	async whenWorkbenchRestored(): Promise<void> {
+		this.logService.info('[driver] Waiting for restored lifecycle phase...');
+		await this.lifecycleService.when(LifecyclePhase.Restored);
+		this.logService.info('[driver] Restored lifecycle phase reached. Waiting for contributions...');
+		await Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).whenRestored;
+		this.logService.info('[driver] Workbench contributions created.');
 	}
 
 	async setValue(selector: string, text: string): Promise<void> {

src/vs/workbench/services/driver/electron-sandbox/driver.ts

@@ -7,6 +7,7 @@ import { mainWindow } from 'vs/base/browser/window';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vs/platform/log/common/log';
 import { BrowserWindowDriver } from 'vs/workbench/services/driver/browser/driver';
 import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
@@ -20,9 +21,10 @@ class NativeWindowDriver extends BrowserWindowDriver {
 		private readonly helper: INativeWindowDriverHelper,
 		@IFileService fileService: IFileService,
 		@IEnvironmentService environmentService: IEnvironmentService,
-		@ILifecycleService lifecycleService: ILifecycleService
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@ILogService logService: ILogService
 	) {
-		super(fileService, environmentService, lifecycleService);
+		super(fileService, environmentService, lifecycleService, logService);
 	}
 
 	override exitApplication(): Promise<void> {