Browse Source

ci: fix flaky test on arm (5-0-x) (#19806)

* ci: update docker options for arm testing
John Kleinschmidt 5 years ago
parent
commit
c00f71513b

+ 2 - 1
spec/api-web-contents-view-spec.js

@@ -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()
     })
   })
 })

+ 4 - 1
spec/fixtures/api/leak-exit-webcontentsview.js

@@ -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 - 0
vsts-arm32v7.yml

@@ -2,6 +2,7 @@ resources:
   containers:
   - container: arm32v7-test-container
     image: electronbuilds/arm32v7:0.0.2
+    options: --shm-size 128m
 
 jobs:
 - job: Test_Arm32v7

+ 2 - 3
vsts-arm64v8.yml

@@ -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