Skip to content

Commit f967d73

Browse files
author
John Kleinschmidt
authored
ci: run tests on WOA hardware (7-0-x) (electron#20091)
* ci: run tests on WOA hardware (electron#20031) * ci: run tests on WOA hardware * Temporarily disable test until electron#20008 is resolved * deterministically run tests in sorted order (cherry picked from commit bedc5f7) * use request instead of blur to detect openExternal success * use blur event on mac, sigh * oh, right, still gotta open an actual url * Disable test until electron#20008 is resolved
1 parent c923aa2 commit f967d73

9 files changed

Lines changed: 61 additions & 44 deletions

File tree

‎appveyor.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,5 @@ deploy_script:
138138
& python script\release\uploaders\upload.py
139139
}
140140
} elseif (Test-Path Env:\TEST_WOA) {
141-
# node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
142-
echo "Eventually run tests on WOA hardware at this step"
141+
node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
143142
}

‎azure-pipelines-woa.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ steps:
66

77
- script: |
88
cd src\electron
9-
npm install --verbose
10-
displayName: 'NPM install'
9+
node script/yarn.js install --frozen-lockfile
10+
displayName: 'Yarn install'
1111

1212
- powershell: |
1313
$localArtifactPath = "$pwd\dist.zip"
@@ -27,16 +27,6 @@ steps:
2727
env:
2828
APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
2929

30-
- powershell: |
31-
$localArtifactPath = "$pwd\src\out\Default\mksnapshot.zip"
32-
$serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/mksnapshot.zip"
33-
Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
34-
cd src\out\Default
35-
& "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y mksnapshot.zip
36-
displayName: 'Download and unzip mksnapshot.zip for test'
37-
env:
38-
APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
39-
4030
- powershell: |
4131
$localArtifactPath = "$pwd\src\node_headers.zip"
4232
$serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
@@ -70,6 +60,16 @@ steps:
7060
env:
7161
ELECTRON_OUT_DIR: Default
7262
IGNORE_YARN_INSTALL_ERROR: 1
63+
ELECTRON_TEST_RESULTS_DIR: junit
64+
MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
65+
MOCHA_REPORTER: mocha-multi-reporters
66+
67+
- task: PublishTestResults@2
68+
displayName: 'Publish Test Results'
69+
inputs:
70+
testResultsFiles: '*.xml'
71+
searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
72+
condition: always()
7373

7474
- script: |
7575
cd src
@@ -78,7 +78,7 @@ steps:
7878
displayName: 'Verify ffmpeg'
7979

8080
- script: |
81-
cd src
82-
echo "Verifying mksnapshot"
83-
python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
84-
displayName: 'Verify mksnapshot'
81+
taskkill /F /IM electron.exe
82+
taskkill /F /IM MicrosoftEdge.exe
83+
displayName: 'Kill processes left running from last test run'
84+
condition: always()

‎script/spec-runner.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ async function main () {
6060
function generateTypeDefinitions () {
6161
const { status } = childProcess.spawnSync('npm', ['run', 'create-typescript-definitions'], {
6262
cwd: path.resolve(__dirname, '..'),
63-
stdio: 'inherit'
63+
stdio: 'inherit',
64+
shell: true
6465
})
6566
if (status !== 0) {
6667
throw new Error(`Electron typescript definition generation failed with exit code: ${status}.`)

‎script/verify-ffmpeg.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from __future__ import print_function
33
import argparse
44
import os
5+
import platform
56
import shutil
67
import subprocess
78
import sys
@@ -46,7 +47,10 @@ def main():
4647
env['ELECTRON_ENABLE_STACK_DUMPING'] = 'true'
4748
# FIXME: Enable after ELECTRON_ENABLE_LOGGING works again
4849
# env['ELECTRON_ENABLE_LOGGING'] = 'true'
49-
subprocess.check_call([electron, test_path] + sys.argv[1:], env=env)
50+
testargs = [electron, test_path]
51+
if sys.platform == 'win32' and platform.machine() == 'ARM64':
52+
testargs.append('--disable-accelerated-video-decode')
53+
subprocess.check_call(testargs, env=env)
5054
except subprocess.CalledProcessError as e:
5155
returncode = e.returncode
5256
except KeyboardInterrupt:

‎spec-main/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,17 @@ app.whenReady().then(() => {
7676
? new RegExp(process.env.npm_config_match, 'g')
7777
: null
7878

79+
const testFiles = []
7980
walker.on('file', (file) => {
8081
if (/-spec\.[tj]s$/.test(file) &&
8182
(!moduleMatch || moduleMatch.test(file))) {
82-
mocha.addFile(file)
83+
testFiles.push(file)
8384
}
8485
})
8586

8687
walker.on('end', () => {
88+
testFiles.sort()
89+
testFiles.forEach((file) => mocha.addFile(file))
8790
const cb = () => {
8891
// Ensure the callback is called after runner is defined
8992
process.nextTick(() => {

‎spec/api-crash-reporter-spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ describe('crashReporter module', () => {
157157
return
158158
}
159159
// TODO(alexeykuzmin): Skip the test instead of marking it as passed.
160-
if (process.env.APPVEYOR === 'True') return done()
160+
if (process.platform === 'win32') return done()
161161
this.timeout(specTimeout)
162162
stopServer = startServer({
163163
callback (port) {

‎spec/api-shell-spec.js‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ const dirtyChai = require('dirty-chai')
44
const fs = require('fs')
55
const path = require('path')
66
const os = require('os')
7+
const http = require('http')
78
const { shell, remote } = require('electron')
89
const { BrowserWindow } = remote
910

1011
const { closeWindow } = require('./window-helpers')
12+
const { emittedOnce } = require('./events-helpers')
1113

1214
const { expect } = chai
1315
chai.use(dirtyChai)
@@ -47,32 +49,34 @@ describe('shell module', () => {
4749
}
4850
})
4951

50-
it('opens an external link', done => {
51-
const url = 'http://www.example.com'
52+
it('opens an external link', async () => {
53+
let url = 'http://127.0.0.1'
54+
let requestReceived
5255
if (process.platform === 'linux') {
5356
process.env.BROWSER = '/bin/true'
5457
process.env.DE = 'generic'
5558
process.env.DISPLAY = ''
59+
requestReceived = Promise.resolve()
60+
} else if (process.platform === 'darwin') {
61+
// On the Mac CI machines, Safari tries to ask for a password to the
62+
// code signing keychain we set up to test code signing (see
63+
// https://github.com/electron/electron/pull/19969#issuecomment-526278890),
64+
// so use a blur event as a crude proxy.
65+
w = new BrowserWindow({ show: true })
66+
requestReceived = emittedOnce(w, 'blur')
67+
} else {
68+
const server = http.createServer((req, res) => {
69+
res.end()
70+
})
71+
await new Promise(resolve => server.listen(0, '127.0.0.1', resolve))
72+
requestReceived = new Promise(resolve => server.on('connection', () => resolve()))
73+
url = `http://127.0.0.1:${server.address().port}`
5674
}
5775

58-
// Ensure an external window is activated via a new window's blur event
59-
w = new BrowserWindow()
60-
let promiseResolved = false
61-
let blurEventEmitted = false
62-
63-
w.on('blur', () => {
64-
blurEventEmitted = true
65-
if (promiseResolved) {
66-
done()
67-
}
68-
})
69-
70-
shell.openExternal(url).then(() => {
71-
promiseResolved = true
72-
if (blurEventEmitted || process.platform === 'linux') {
73-
done()
74-
}
75-
})
76+
await Promise.all([
77+
shell.openExternal(url),
78+
requestReceived
79+
])
7680
})
7781
})
7882

‎spec/api-web-contents-spec.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ describe('webContents module', () => {
5454
.and.have.property('code', 'ERR_FILE_NOT_FOUND')
5555
})
5656

57-
it('rejects when loading fails due to DNS not resolved', async () => {
57+
// Temporarily disable on WOA until
58+
// https://github.com/electron/electron/issues/20008 is resolved
59+
const testFn = (process.platform === 'win32' && process.arch === 'arm64' ? it.skip : it)
60+
testFn('rejects when loading fails due to DNS not resolved', async () => {
5861
await expect(w.loadURL('https://err.name.not.resolved')).to.eventually.be.rejected
5962
.and.have.property('code', 'ERR_NAME_NOT_RESOLVED')
6063
})

‎spec/static/index.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,17 @@
8484
? new RegExp(process.env.npm_config_match, 'g')
8585
: null
8686

87+
const testFiles = []
8788
walker.on('file', (file) => {
8889
if (/-spec\.js$/.test(file) && !file.includes(crashSpec) &&
8990
(!moduleMatch || moduleMatch.test(file))) {
90-
mocha.addFile(file)
91+
testFiles.push(file)
9192
}
9293
})
9394

9495
walker.on('end', () => {
96+
testFiles.sort()
97+
testFiles.forEach((file) => mocha.addFile(file))
9598
if (!process.env.npm_config_match || new RegExp(process.env.npm_config_match, 'g').test(crashSpec)) {
9699
mocha.addFile(path.resolve(__dirname, '..', crashSpec))
97100
}

0 commit comments

Comments
 (0)