Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: some APIs modified for ASAR support cannot be util.promisify'ed (backport: 2-0-x) #13960

Merged
merged 1 commit into from Aug 7, 2018

Conversation

Projects
None yet
3 participants
@miniak
Copy link
Contributor

miniak commented Aug 6, 2018

Backport #13845

Checklist

@miniak miniak requested a review from as a code owner Aug 6, 2018

@miniak miniak force-pushed the miniak/fix-promisify-2.0 branch from 724b47f to 6a86831 Aug 6, 2018

@miniak

This comment has been minimized.

Copy link
Contributor Author

miniak commented Aug 6, 2018

the failing tests on Windows are unrelated to my change

not ok 47 app module mixed sandbox option when app.enableMixedSandbox() is called adds --enable-sandbox to render processes created with sandbox: true
  Error: Timeout of 30000ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves.
      at C:\projects\electron-39ng6\spec\node_modules\mocha\lib\runnable.js:232:19
not ok 48 app module mixed sandbox option when the app is launched with --enable-mixed-sandbox adds --enable-sandbox to render processes created with sandbox: true
  Error: Timeout of 30000ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves.
      at C:\projects\electron-39ng6\spec\node_modules\mocha\lib\runnable.js:232:19
@codebytere

This comment has been minimized.

Copy link
Member

codebytere commented Aug 6, 2018

@miniak those tests are suppressed on master and being addressed separately

@jkleinsc jkleinsc merged commit e8e542b into 2-0-x Aug 7, 2018

12 of 14 checks passed

appveyor: electron-ia32-branch AppVeyor build failed
Details
appveyor: electron-x64-branch AppVeyor build failed
Details
Semantic Pull Request ready to be squashed
Details
WIP ready for review
Details
appveyor: electron-ia32-pr AppVeyor build succeeded
Details
appveyor: electron-x64-pr AppVeyor build succeeded
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-mas-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-osx-x64 Your tests passed on CircleCI!
Details

@jkleinsc jkleinsc deleted the miniak/fix-promisify-2.0 branch Aug 7, 2018

@daviwil daviwil referenced this pull request Aug 9, 2018

Merged

:arrow_up: electron@2.0.7 #17815

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.