Skip to content

Commit

Permalink
ci: fix flaky test on arm (5-0-x) (#19806)
Browse files Browse the repository at this point in the history
* ci: update docker options for arm testing
  • Loading branch information
John Kleinschmidt committed Aug 16, 2019
1 parent 9c2d9ba commit c00f715
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion spec/api-web-contents-view-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ describe('WebContentsView', () => {
const appPath = path.join(__dirname, 'fixtures', 'api', 'leak-exit-webcontentsview.js')
const electronPath = remote.getGlobal('process').execPath
const appProcess = ChildProcess.spawn(electronPath, [appPath])
const [code] = await emittedOnce(appProcess, 'close')
const [code, message] = await emittedOnce(appProcess, 'close')
expect(code).to.equal(0)
expect(message).to.be.null()
})
})
})
5 changes: 4 additions & 1 deletion spec/fixtures/api/leak-exit-webcontentsview.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ app.on('ready', function () {
const web = webContents.create({})
new WebContentsView(web) // eslint-disable-line

process.nextTick(() => app.quit())
process.nextTick(() => {
console.log('Quitting app')
app.quit()
})
})
1 change: 1 addition & 0 deletions vsts-arm32v7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ resources:
containers:
- container: arm32v7-test-container
image: electronbuilds/arm32v7:0.0.2
options: --shm-size 128m

jobs:
- job: Test_Arm32v7
Expand Down
5 changes: 2 additions & 3 deletions vsts-arm64v8.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
resources:
containers:
- container: arm64v8-test-container
image: electronbuilds/arm64v8:0.0.4
env:
RUN_NATIVE_MKSNAPSHOT: true
image: electronbuilds/arm64v8:0.0.5
options: --shm-size 128m

jobs:
- job: Test_Arm64
Expand Down

0 comments on commit c00f715

Please sign in to comment.