process: fix calculation in process.uptime() #26206
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
the
c++
addaleax
approved these changes
Feb 19, 2019
Trott
reviewed
Feb 19, 2019
test/parallel/test-process-uptime.js
Outdated
| assert.ok(uptime <= original + 3); | ||
| }, 2000); | ||
| assert.ok(original < uptime); | ||
| }, common.platformTimeout(100)); |
There was a problem hiding this comment.
We don't need to use common.platformTimeout() at all if all we're checking is original < uptime. For that matter, this can probably use a value more like 5 than 100?
Trott
approved these changes
Feb 19, 2019
joyeecheung
force-pushed
the
fix-uptime
branch
from
56f1e5c
to
ae991b2
Compare
Yes. (This is what happens when I stay up at 2am 🤦♀️ ) Updated the test description and the timeout. |
Trott
added
the
author ready
richardlau
approved these changes
Feb 19, 2019
In nodejs#26016 the result returned by process.uptime() was mistakenly set to be based in the wrong unit. This patch fixes the calculation and makes sure the returned value is in seconds. Refs: nodejs#26016
In addition, do not make too many assumptions about the startup time and timer latency in test-process-uptime. Instead only test that the value is likely in the correct unit (seconds) and it should be increasing in subsequent calls.
|
Tiny lint error: |
Trott
reviewed
Feb 19, 2019
test/parallel/test-process-uptime.js
Outdated
| @@ -20,18 +20,18 @@ | |||
| // USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
|
|
|||
| 'use strict'; | |||
| require('../common'); | |||
| const common = require('../common'); | |||
There was a problem hiding this comment.
Suggested change
| const common = require('../common'); | |
| require('../common'); |
|
I'd like to fast-track this (to fix the failing test), but it's 3AM in China, so I'm going to push the tiny lint fix and re-run CI. |
|
Please 👍 here if you support fast-tracking. @addaleax @richardlau |
|
Landed in 129516d...5c9b37b. Thanks, @joyeecheung! 🎉 |
Trott
pushed a commit
to Trott/io.js
that referenced
this pull request
Feb 19, 2019
In nodejs#26016 the result returned by process.uptime() was mistakenly set to be based in the wrong unit. This patch fixes the calculation and makes sure the returned value is in seconds. Refs: nodejs#26016 PR-URL: nodejs#26206 Fixes: nodejs#26205 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Trott
pushed a commit
to Trott/io.js
that referenced
this pull request
Feb 19, 2019
In addition, do not make too many assumptions about the startup time and timer latency in test-process-uptime. Instead only test that the value is likely in the correct unit (seconds) and it should be increasing in subsequent calls. PR-URL: nodejs#26206 Fixes: nodejs#26205 Refs: nodejs#26016 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
addaleax
pushed a commit
that referenced
this pull request
Feb 21, 2019
In #26016 the result returned by process.uptime() was mistakenly set to be based in the wrong unit. This patch fixes the calculation and makes sure the returned value is in seconds. Refs: #26016 PR-URL: #26206 Fixes: #26205 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
addaleax
pushed a commit
that referenced
this pull request
Feb 21, 2019
In addition, do not make too many assumptions about the startup time and timer latency in test-process-uptime. Instead only test that the value is likely in the correct unit (seconds) and it should be increasing in subsequent calls. PR-URL: #26206 Fixes: #26205 Refs: #26016 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Merged
rvagg
pushed a commit
that referenced
this pull request
Feb 28, 2019
In #26016 the result returned by process.uptime() was mistakenly set to be based in the wrong unit. This patch fixes the calculation and makes sure the returned value is in seconds. Refs: #26016 PR-URL: #26206 Fixes: #26205 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
rvagg
pushed a commit
that referenced
this pull request
Feb 28, 2019
In addition, do not make too many assumptions about the startup time and timer latency in test-process-uptime. Instead only test that the value is likely in the correct unit (seconds) and it should be increasing in subsequent calls. PR-URL: #26206 Fixes: #26205 Refs: #26016 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
process: fix calculation in process.uptime()
In #26016 the result returned
by process.uptime() was mistakenly set to be based in the wrong
unit. This patch fixes the calculation and makes sure the returned
value is in seconds.
Refs: #26016
Fixes: #26205
process: move test-process-uptime to parallel
In addition, do not make too many assumptions about the startup
time and timer latency in test-process-uptime. Instead only test
that the value is likely in the correct unit (seconds) and it should
be increasing in subsequent calls.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes