Merge 1d3ad4a into 2ab316b

Author: bcotrim

.buildkite/pipeline.yml

@@ -56,6 +56,12 @@ steps:
   - label: E2E Tests on {{matrix}}
     key: e2e_tests
     command: |
+      # Windows-specific setup
+      if [ "{{matrix}}" = "windows" ]; then
+        # prepare_windows_host_for_app_distribution.ps1 comes from CI Toolkit Plugin
+        powershell -Command "& 'prepare_windows_host_for_app_distribution.ps1' -InstallPython \$true -InstallNativeCompilationTools \$true"
+      fi
+
       # call with bash explicitly because we run this on Windows, too
       bash .buildkite/commands/install-node-dependencies.sh
       export IS_DEV_BUILD=true
@@ -65,6 +71,8 @@ steps:
       npm run e2e
     artifact_paths:
       - test-results/**/*.zip
+      - test-results/**/*.png
+      - test-results/**/*error-context.md
     plugins: [$CI_TOOLKIT_PLUGIN, $NVM_PLUGIN]
     agents:
       queue: "{{matrix}}"
@@ -73,7 +81,7 @@ steps:
       DEBUG: "pw:browser"
     matrix:
       - mac
-      #- windows
+      - windows
     notify:
       - github_commit_status:
           context: All E2E Tests

e2e/blueprints.test.ts

@@ -24,7 +24,7 @@ test.describe( 'Blueprints', () => {
 		}
 
 		const siteContent = new SiteContent( session.mainWindow, 'My WordPress Website' );
-		await expect( siteContent.siteNameHeading ).toBeVisible( { timeout: 60_000 } );
+		await expect( siteContent.siteNameHeading ).toBeVisible( { timeout: 120_000 } );
 	} );
 
 	test.afterAll( async () => {
@@ -55,7 +55,7 @@ test.describe( 'Blueprints', () => {
 
 		// Wait for site to be created and running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 60_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 
 		// Navigate to Settings tab to get admin URL
 		const settingsTab = await siteContent.navigateToTab( 'Settings' );
@@ -90,7 +90,7 @@ test.describe( 'Blueprints', () => {
 
 		// Wait for site to be created and running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 60_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 
 		// Navigate to Settings tab to get admin URL
 		const settingsTab = await siteContent.navigateToTab( 'Settings' );
@@ -127,7 +127,7 @@ test.describe( 'Blueprints', () => {
 
 		// Wait for site to be created and running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 60_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 
 		// Navigate to Settings tab to get admin URL
 		const settingsTab = await siteContent.navigateToTab( 'Settings' );
@@ -162,7 +162,7 @@ test.describe( 'Blueprints', () => {
 
 		// Wait for site to be created and running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 60_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 
 		// Navigate to Settings tab to get admin URL
 		const settingsTab = await siteContent.navigateToTab( 'Settings' );
@@ -199,7 +199,7 @@ test.describe( 'Blueprints', () => {
 
 		// Wait for site to be created and running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 60_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 
 		// Navigate to Settings tab to verify site is accessible
 		const settingsTab = await siteContent.navigateToTab( 'Settings' );
@@ -237,7 +237,7 @@ test.describe( 'Blueprints', () => {
 
 		// Wait for site to be created and running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 60_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 
 		// Navigate to Settings tab to verify site is accessible
 		const settingsTab = await siteContent.navigateToTab( 'Settings' );

e2e/sites.test.ts

@@ -30,7 +30,7 @@ test.describe( 'Servers', () => {
 		}
 
 		const siteContent = new SiteContent( session.mainWindow, defaultSiteName );
-		await expect( siteContent.siteNameHeading ).toBeVisible( { timeout: 60_000 } );
+		await expect( siteContent.siteNameHeading ).toBeVisible( { timeout: 120_000 } );
 	} );
 
 	test.afterAll( async () => {
@@ -52,7 +52,7 @@ test.describe( 'Servers', () => {
 
 		// Check the site is running
 		const siteContent = new SiteContent( session.mainWindow, siteName );
-		await expect( siteContent.runningButton ).toBeAttached( { timeout: 30_000 } );
+		await expect( siteContent.runningButton ).toBeAttached( { timeout: 120_000 } );
 		expect( await siteContent.siteNameHeading ).toHaveText( siteName );
 
 		// Check a WordPress site has been created

playwright.config.ts

@@ -12,7 +12,7 @@ export default defineConfig( {
 		trace: 'retain-on-failure',
 	},
 
-	timeout: 60_000,
+	timeout: 180_000,
 
 	// Global expect timeout for all assertions
 	expect: {

src/lib/windows-helpers.ts

@@ -14,6 +14,7 @@ export async function promptWindowsSpeedUpSites( {
 
 	if (
 		process.platform !== 'win32' ||
+		process.env.E2E ||
 		( skipIfAlreadyPrompted && typeof userData.promptWindowsSpeedUpResult !== 'undefined' )
 	) {
 		return;