Skip to content

Enable Windows E2E tests in CI #1899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Enable Windows E2E tests in CI #1899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}"
Expand All @@ -73,7 +81,7 @@ steps:
DEBUG: "pw:browser"
matrix:
- mac
#- windows
- windows
notify:
- github_commit_status:
context: All E2E Tests
Expand Down
14 changes: 7 additions & 7 deletions e2e/blueprints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down Expand Up @@ -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' );
Expand Down Expand Up @@ -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' );
Expand Down Expand Up @@ -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' );
Expand Down Expand Up @@ -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' );
Expand Down Expand Up @@ -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' );
Expand Down Expand Up @@ -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' );
Expand Down
4 changes: 2 additions & 2 deletions e2e/sites.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default defineConfig( {
trace: 'retain-on-failure',
},

timeout: 60_000,
timeout: 180_000,

// Global expect timeout for all assertions
expect: {
Expand Down
1 change: 1 addition & 0 deletions src/lib/windows-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export async function promptWindowsSpeedUpSites( {

if (
process.platform !== 'win32' ||
process.env.E2E ||
( skipIfAlreadyPrompted && typeof userData.promptWindowsSpeedUpResult !== 'undefined' )
) {
return;
Expand Down