From 9055b5cf6d4731897b26f7a4d16eb8e2c94fbd3f Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 15 Oct 2019 17:10:28 -0700 Subject: [PATCH] test: simplify node setInterval test (#20594) --- spec/node-spec.js | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/spec/node-spec.js b/spec/node-spec.js index 36037da370..682e8ad87e 100644 --- a/spec/node-spec.js +++ b/spec/node-spec.js @@ -217,35 +217,18 @@ describe('node feature', () => { describe('setInterval called under blink env in renderer process', () => { it('can be scheduled in time', (done) => { - let interval = null - let clearing = false - const clear = () => { - if (interval === null || clearing) return - - // interval might trigger while clearing (remote is slow sometimes) - clearing = true - clearInterval(interval) - clearing = false - interval = null + const id = setInterval(() => { + clearInterval(id) done() - } - interval = setInterval(clear, 10) + }, 10) }) it('can be scheduled in time from timers module', (done) => { - let interval = null - let clearing = false - const clear = () => { - if (interval === null || clearing) return - - // interval might trigger while clearing (remote is slow sometimes) - clearing = true - require('timers').clearInterval(interval) - clearing = false - interval = null + const { setInterval, clearInterval } = require('timers') + const id = setInterval(() => { + clearInterval(id) done() - } - interval = require('timers').setInterval(clear, 10) + }, 10) }) }) })