Commit b69cac7
test: refactor test-cluster-disconnect
Replace `process.once('exit', ...)` with `common.mustCall()`.
Remove unneeded variable in loop declaration.
PR-URL: #11981
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 0fff04f commit b69cac7
1 file changed
Lines changed: 8 additions & 27 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,7 +21,7 @@ if (cluster.isWorker) { | |||
| 21 | 21 | const socket = net.connect(port, '127.0.0.1', () => { | |
| 22 | 22 | // buffer result | |
| 23 | 23 | let result = ''; | |
| 24 | - socket.on('data', common.mustCall((chunk) => { result += chunk; })); | ||
| 24 | + socket.on('data', (chunk) => { result += chunk; }); | ||
| 25 | 25 | ||
| 26 | 26 | // check result | |
| 27 | 27 | socket.on('end', common.mustCall(() => { | |
@@ -34,7 +34,7 @@ if (cluster.isWorker) { | |||
| 34 | 34 | const testCluster = function(cb) { | |
| 35 | 35 | let done = 0; | |
| 36 | 36 | ||
| 37 | - for (let i = 0, l = servers; i < l; i++) { | ||
| 37 | + for (let i = 0; i < servers; i++) { | ||
| 38 | 38 | testConnection(common.PORT + i, (success) => { | |
| 39 | 39 | assert.ok(success); | |
| 40 | 40 | done += 1; | |
@@ -60,40 +60,21 @@ if (cluster.isWorker) { | |||
| 60 | 60 | } | |
| 61 | 61 | }; | |
| 62 | 62 | ||
| 63 | - | ||
| 64 | - const results = { | ||
| 65 | - start: 0, | ||
| 66 | - test: 0, | ||
| 67 | - disconnect: 0 | ||
| 68 | - }; | ||
| 69 | - | ||
| 70 | 63 | const test = function(again) { | |
| 71 | 64 | //1. start cluster | |
| 72 | - startCluster(() => { | ||
| 73 | - results.start += 1; | ||
| 74 | - | ||
| 65 | + startCluster(common.mustCall(() => { | ||
| 75 | 66 | //2. test cluster | |
| 76 | - testCluster(() => { | ||
| 77 | - results.test += 1; | ||
| 78 | - | ||
| 67 | + testCluster(common.mustCall(() => { | ||
| 79 | 68 | //3. disconnect cluster | |
| 80 | - cluster.disconnect(() => { | ||
| 81 | - results.disconnect += 1; | ||
| 82 | - | ||
| 69 | + cluster.disconnect(common.mustCall(() => { | ||
| 83 | 70 | // run test again to confirm cleanup | |
| 84 | 71 | if (again) { | |
| 85 | 72 | test(); | |
| 86 | 73 | } | |
| 87 | - }); | ||
| 88 | - }); | ||
| 89 | - }); | ||
| 74 | + })); | ||
| 75 | + })); | ||
| 76 | + })); | ||
| 90 | 77 | }; | |
| 91 | 78 | ||
| 92 | 79 | test(true); | |
| 93 | - | ||
| 94 | - process.once('exit', () => { | ||
| 95 | - assert.strictEqual(results.start, 2); | ||
| 96 | - assert.strictEqual(results.test, 2); | ||
| 97 | - assert.strictEqual(results.disconnect, 2); | ||
| 98 | - }); | ||
| 99 | 80 | } | |
0 commit comments