mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #14049 from electron/fix-flaky-sandbox-tests

Browse source 
fix: Fix flaky sandbox tests
This commit is contained in:
John Kleinschmidt 2018-08-13 13:26:52 -07:00 committed by GitHub
commit cb4b3e7be0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
spec/fixtures/api/mixed-sandbox-app/main.js vendored
View file

@ -10,27 +10,32 @@ if (!process.argv.includes('--enable-mixed-sandbox')) {
app.enableMixedSandbox() app.enableMixedSandbox()
} }
let sandboxWindow let currentWindowSandboxed = false
let noSandboxWindow
app.once('ready', () => { app.once('ready', () => {
sandboxWindow = new BrowserWindow({ function testWindow (isSandboxed, callback) {
show: false, currentWindowSandboxed = isSandboxed
webPreferences: { let currentWindow = new BrowserWindow({
preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'), show: false,
sandbox: true webPreferences: {
} preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
}) sandbox: isSandboxed
sandboxWindow.loadURL('about:blank') }
})
noSandboxWindow = new BrowserWindow({ currentWindow.loadURL('about:blank')
show: false, currentWindow.webContents.once('devtools-opened', () => {
webPreferences: { if (isSandboxed) {
preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'), argv.sandboxDevtools = true
sandbox: false } else {
} argv.noSandboxDevtools = true
}) }
noSandboxWindow.loadURL('about:blank') if (callback) {
callback()
}
finish()
})
currentWindow.webContents.openDevTools()
}
const argv = { const argv = {
sandbox: null, sandbox: null,
@ -41,6 +46,10 @@ app.once('ready', () => {
let connected = false let connected = false
testWindow(true, () => {
testWindow()
})
function finish () { function finish () {
if (connected && argv.sandbox != null && argv.noSandbox != null && if (connected && argv.sandbox != null && argv.noSandbox != null &&
argv.noSandboxDevtools != null && argv.sandboxDevtools != null) { argv.noSandboxDevtools != null && argv.sandboxDevtools != null) {
@ -57,22 +66,10 @@ app.once('ready', () => {
finish() finish()
}) })
noSandboxWindow.webContents.once('devtools-opened', () => {
argv.noSandboxDevtools = true
finish()
})
noSandboxWindow.webContents.openDevTools()
sandboxWindow.webContents.once('devtools-opened', () => {
argv.sandboxDevtools = true
finish()
})
sandboxWindow.webContents.openDevTools()
ipcMain.on('argv', (event, value) => { ipcMain.on('argv', (event, value) => {
if (event.sender === sandboxWindow.webContents) { if (currentWindowSandboxed) {
argv.sandbox = value argv.sandbox = value
} else if (event.sender === noSandboxWindow.webContents) { } else {
argv.noSandbox = value argv.noSandbox = value
} }
finish() finish()