Skip to content

Commit

Permalink
fix: don't pass invalid signal to subprocess.exit on crash (#15944)
Browse files Browse the repository at this point in the history
  • Loading branch information
flotwig authored Apr 12, 2021
1 parent 602c762 commit 86ffe20
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions packages/server/lib/browsers/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ module.exports = {
return win.webContents.getOSProcessId()
})],
browserWindow: win,
kill: (isProcessExit) => {
if (isProcessExit) {
kill () {
if (this.isProcessExit) {
// if the process is exiting, all BrowserWindows will be destroyed anyways
return
}
Expand Down
4 changes: 3 additions & 1 deletion packages/server/lib/browsers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ const kill = function (unbind, isProcessExit) {

debug('killing browser process')

_instance.kill(isProcessExit)
_instance.isProcessExit = isProcessExit

_instance.kill()
})
}

Expand Down

4 comments on commit 86ffe20

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 86ffe20 Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/7.0.2/circle-develop-86ffe2062b9b955af367a75671bf1409a779d0fd/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 86ffe20 Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppVeyor has built the win32 ia32 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/7.0.2/appveyor-develop-86ffe2062b9b955af367a75671bf1409a779d0fd/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 86ffe20 Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppVeyor has built the win32 x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/7.0.2/appveyor-develop-86ffe2062b9b955af367a75671bf1409a779d0fd/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 86ffe20 Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/7.0.2/circle-develop-86ffe2062b9b955af367a75671bf1409a779d0fd/cypress.tgz

Please sign in to comment.