Commit a667ac1
test: fix flaky timers-block-eventloop test
Due to extensive reliance on timings and the fs module, this test
is currently inherently flaky. Refactor it to simply use setImmediate
and only one busy loop.
PR-URL: #18567
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>1 parent 6ed4e69 commit a667ac1
1 file changed
Lines changed: 11 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,24 +1,18 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | 2 | ||
| 3 | 3 | const common = require('../common'); | |
| 4 | - const fs = require('fs'); | ||
| 5 | - const platformTimeout = common.platformTimeout; | ||
| 4 | + const assert = require('assert'); | ||
| 6 | 5 | ||
| 6 | + let called = false; | ||
| 7 | 7 | const t1 = setInterval(() => { | |
| 8 | - common.busyLoop(platformTimeout(12)); | ||
| 9 | - }, platformTimeout(10)); | ||
| 10 | - | ||
| 11 | - const t2 = setInterval(() => { | ||
| 12 | - common.busyLoop(platformTimeout(15)); | ||
| 13 | - }, platformTimeout(10)); | ||
| 14 | - | ||
| 15 | - const t3 = | ||
| 16 | - setTimeout(common.mustNotCall('eventloop blocked!'), platformTimeout(200)); | ||
| 17 | - | ||
| 18 | - setTimeout(function() { | ||
| 19 | - fs.stat('/dev/nonexistent', () => { | ||
| 8 | + assert(!called); | ||
| 9 | + called = true; | ||
| 10 | + setImmediate(common.mustCall(() => { | ||
| 20 | 11 | clearInterval(t1); | |
| 21 | 12 | clearInterval(t2); | |
| 22 | - clearTimeout(t3); | ||
| 23 | - }); | ||
| 24 | - }, platformTimeout(50)); | ||
| 13 | + })); | ||
| 14 | + }, 10); | ||
| 15 | + | ||
| 16 | + const t2 = setInterval(() => { | ||
| 17 | + common.busyLoop(20); | ||
| 18 | + }, 10); | ||
0 commit comments