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

test: add test-cluster-worker-deprecated #10675

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions lib/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ function Worker(options) {
this.exitedAfterDisconnect = undefined;

Object.defineProperty(this, 'suicide', {
get: internalUtil.deprecate(() => {
return this.exitedAfterDisconnect;
}, 'worker.suicide is deprecated. ' +
'Please use worker.exitedAfterDisconnect.'),
set: internalUtil.deprecate((val) => {
this.exitedAfterDisconnect = val;
}, 'worker.suicide is deprecated. ' +
'Please use worker.exitedAfterDisconnect.'),
get: internalUtil.deprecate(
Copy link
Contributor

Choose a reason for hiding this comment

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

I would describe this as cluster: better suicide deprecation message (or something of the like), since its a change to improve the deprecation message, along with a unit test for that change.

Copy link
Member Author

Choose a reason for hiding this comment

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

@sam-github The deprecation message is not being changed here.

The new test exercises the getter and setter. They were not being exercised. The code change to cluster.js refactor the getter/setter for clarity (good-bye, string concatenation), but do not change the behavior.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, I missed that, the diff is hard to read. Shouldn't a change to lib/cluster.js have cluster: in its commit message? Even if its just a stylistic change?

() => this.exitedAfterDisconnect,
'worker.suicide is deprecated. Please use worker.exitedAfterDisconnect.'),
set: internalUtil.deprecate(
(val) => { this.exitedAfterDisconnect = val; },
'worker.suicide is deprecated. Please use worker.exitedAfterDisconnect.'),
enumerable: true
});

Expand Down
18 changes: 18 additions & 0 deletions test/parallel/test-cluster-worker-deprecated.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';
require('../common');

const assert = require('assert');
const cluster = require('cluster');

const worker = new cluster.Worker();

assert.strictEqual(worker.exitedAfterDisconnect, undefined);
assert.strictEqual(worker.suicide, undefined);

worker.exitedAfterDisconnect = 'recommended';
assert.strictEqual(worker.exitedAfterDisconnect, 'recommended');
assert.strictEqual(worker.suicide, 'recommended');

worker.suicide = 'deprecated';
assert.strictEqual(worker.exitedAfterDisconnect, 'deprecated');
assert.strictEqual(worker.suicide, 'deprecated');