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

deps: upgrade to libuv 1.28.0 #27241

Merged
merged 3 commits into from
Apr 22, 2019
Merged

deps: upgrade to libuv 1.28.0 #27241

merged 3 commits into from
Apr 22, 2019

Conversation

cjihrig
Copy link
Contributor

@cjihrig cjihrig commented Apr 15, 2019

Notable changes:

  • uv_gettimeofday() has been added.
  • Streaming readdir() via the uv_fs_{open,read,close}dir() methods.
  • A macOS copyfile() permissions bug has been fixed.
  • A bug in uv_interface_addresses() on machines with multiple interfaces has been fixed.
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-bot
Copy link
Collaborator

@nodejs-github-bot nodejs-github-bot added the libuv Issues and PRs related to the libuv dependency or the uv binding. label Apr 15, 2019
Copy link
Member

@BridgeAR BridgeAR left a comment

Choose a reason for hiding this comment

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

RSLGTM

Copy link
Member

@Trott Trott left a comment

Choose a reason for hiding this comment

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

Rubber-stamp LGTM

@Trott
Copy link
Member

Trott commented Apr 15, 2019

The two commits will be squashed into one when landing? Otherwise, the first commit will have a failing test, possibly messing up a git bisect. Maybe that doesn't matter too much as you don't usually run make test with git bisect but instead something more specific....

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 16, 2019
@nodejs-github-bot
Copy link
Collaborator

@nodejs-github-bot
Copy link
Collaborator

@richardlau
Copy link
Member

test-fs-copyfile-respect-permissions is failing on Windows:
e.g. https://ci.nodejs.org/job/node-test-binary-windows-2/190/COMPILED_BY=vs2017,RUNNER=win2016,RUN_SUBSET=0/testReport/junit/(root)/test/parallel_test_fs_copyfile_respect_permissions/

AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
+ actual - expected

+ 'EPERM'
- 'EACCES'
    at Object.check (c:\workspace\node-test-binary-windows-2\test\parallel\test-fs-copyfile-respect-permissions.js:26:12)
    at expectedException (assert.js:586:19)
    at expectsError (assert.js:686:17)
    at Function.throws (assert.js:717:3)
    at Object.<anonymous> (c:\workspace\node-test-binary-windows-2\test\parallel\test-fs-copyfile-respect-permissions.js:37:10)
    at Module._compile (internal/modules/cjs/loader.js:766:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:777:10)
    at Module.load (internal/modules/cjs/loader.js:635:32)
    at Function.Module._load (internal/modules/cjs/loader.js:562:12)
    at Function.Module.runMain (internal/modules/cjs/loader.js:833:10)

@richardlau
Copy link
Member

@cjihrig the following should fix the test:

diff --git a/test/parallel/test-fs-copyfile-respect-permissions.js b/test/parallel/test-fs-
index 34697ee..3f8d025 100644
--- a/test/parallel/test-fs-copyfile-respect-permissions.js
+++ b/test/parallel/test-fs-copyfile-respect-permissions.js
@@ -23,7 +23,9 @@ function beforeEach() {
   fs.chmodSync(dest, '444');

   const check = (err) => {
-    assert.strictEqual(err.code, 'EACCES');
+    const expected = ['EACCES', 'EPERM'];
+    assert(expected.includes(err.code),
+           `err.code '${err.code}' is neither '${expected.join('\' nor \'')}'`);
     assert.strictEqual(fs.readFileSync(dest, 'utf8'), 'dest');
     return true;
   };

Also please remove the entries in test/known_issues/known_issues.status:

diff --git a/test/known_issues/known_issues.status b/test/known_issues/known_issues.status
index d7e0b54..3463f0a 100644
--- a/test/known_issues/known_issues.status
+++ b/test/known_issues/known_issues.status
@@ -7,24 +7,18 @@ prefix known_issues
 [true] # This section applies to all platforms

 [$system==win32]
-test-fs-copyfile-respect-permissions: SKIP

 [$system==linux]
 test-vm-timeout-escape-promise: PASS,FLAKY
-test-fs-copyfile-respect-permissions: SKIP

 [$system==macos]

 [$system==solaris]
-test-fs-copyfile-respect-permissions: SKIP

 [$system==freebsd]
-test-fs-copyfile-respect-permissions: SKIP

 [$system==aix]
-test-fs-copyfile-respect-permissions: SKIP

 [$arch==arm]
 # https://github.com/nodejs/node/issues/24120
 test-vm-timeout-escape-nexttick: PASS,FLAKY
-test-fs-copyfile-respect-permissions: SKIP

@richardlau
Copy link
Member

Fixes: #27273

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Apr 22, 2019

CI: https://ci.nodejs.org/job/node-test-pull-request/22626/

EDIT(cjihrig): CI was green.

Notable changes:

- uv_gettimeofday() has been added.
- Streaming readdir() via the uv_fs_{open,read,close}dir() methods.
- A macOS copyfile() permissions bug has been fixed.
- A bug in uv_interface_addresses() on machines with multiple
  interfaces has been fixed.

Fixes: nodejs#27273
PR-URL: nodejs#27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
As of libuv 1.28.0, this bug is fixed, and the test can be
moved to parallel. This commit also updates an error code
check to work on Windows.

PR-URL: nodejs#27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This is no longer a flakey test, and should run everywhere.

PR-URL: nodejs#27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@cjihrig
Copy link
Contributor Author

cjihrig commented Apr 22, 2019

Landed in 2161690...a3d1922. Thanks for the reviews, especially @richardlau.

@cjihrig cjihrig closed this Apr 22, 2019
@cjihrig cjihrig deleted the libuv branch April 22, 2019 16:05
@cjihrig cjihrig merged commit a3d1922 into nodejs:master Apr 22, 2019
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request May 20, 2019
Notable changes:

- uv_gettimeofday() has been added.
- Streaming readdir() via the uv_fs_{open,read,close}dir() methods.
- A macOS copyfile() permissions bug has been fixed.
- A bug in uv_interface_addresses() on machines with multiple
  interfaces has been fixed.

Fixes: nodejs#27273
PR-URL: nodejs#27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request May 20, 2019
As of libuv 1.28.0, this bug is fixed, and the test can be
moved to parallel. This commit also updates an error code
check to work on Windows.

PR-URL: nodejs#27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins pushed a commit to MylesBorins/node that referenced this pull request May 20, 2019
This is no longer a flakey test, and should run everywhere.

PR-URL: nodejs#27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins pushed a commit that referenced this pull request May 21, 2019
Notable changes:

- uv_gettimeofday() has been added.
- Streaming readdir() via the uv_fs_{open,read,close}dir() methods.
- A macOS copyfile() permissions bug has been fixed.
- A bug in uv_interface_addresses() on machines with multiple
  interfaces has been fixed.

Fixes: #27273
Backport-PR-URL: #27776
PR-URL: #27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins pushed a commit that referenced this pull request May 21, 2019
As of libuv 1.28.0, this bug is fixed, and the test can be
moved to parallel. This commit also updates an error code
check to work on Windows.

Backport-PR-URL: #27776
PR-URL: #27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins pushed a commit that referenced this pull request May 21, 2019
This is no longer a flakey test, and should run everywhere.

Backport-PR-URL: #27776
PR-URL: #27241
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@BethGriggs BethGriggs mentioned this pull request May 22, 2019
BethGriggs added a commit that referenced this pull request May 28, 2019
Notable changes:

- **deps**:
  - update ICU to 64.2 (Ujjwal Sharma)
    [#27361](#27361)
  - upgrade npm to 6.9.0 (Kat Marchán)
    [#26244](#26244)
  - upgrade openssl sources to 1.1.1b (Sam Roberts)
    [#26327](#26327)
  - upgrade to libuv 1.28.0 (cjihrig)
    [#27241](#27241)
- **events**:
  - add once method to use promises with EventEmitter (Matteo Collina)
   [#26078](#26078)
- **n-api**:
  - mark thread-safe function as stable (Gabriel Schulhof)
    [#25556](#25556)
- **repl**:
  - support top-level for-await-of (Shelley Vohr)
    [#23841](#23841)
- **zlib**:
  - add brotli support (Anna Henningsen)
    [#24938](#24938)

PR-URL: #27514
BethGriggs added a commit that referenced this pull request May 28, 2019
Notable changes:

- **deps**:
  - update ICU to 64.2 (Ujjwal Sharma)
    [#27361](#27361)
  - upgrade npm to 6.9.0 (Kat Marchán)
    [#26244](#26244)
  - upgrade openssl sources to 1.1.1b (Sam Roberts)
    [#26327](#26327)
  - upgrade to libuv 1.28.0 (cjihrig)
    [#27241](#27241)
- **events**:
  - add once method to use promises with EventEmitter (Matteo Collina)
   [#26078](#26078)
- **n-api**:
  - mark thread-safe function as stable (Gabriel Schulhof)
    [#25556](#25556)
- **repl**:
  - support top-level for-await-of (Shelley Vohr)
    [#23841](#23841)
- **zlib**:
  - add brotli support (Anna Henningsen)
    [#24938](#24938)

PR-URL: #27514
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. libuv Issues and PRs related to the libuv dependency or the uv binding.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants