test: use block-scoping in test/pummel/test-timers.js

PR-URL: #34630 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

Author: Trott

test/pummel/test-timers.js

@@ -25,99 +25,104 @@ const assert = require('assert');
 
 constWINDOW=200;// Why does this need to be so big?
 
-letinterval_count=0;
 
 conststarttime=newDate();
-setTimeout(common.mustCall(function(){
-constendtime=newDate();
+{
+setTimeout(common.mustCall(function(){
+constendtime=newDate();
 
-constdiff=endtime-starttime;
-assert.ok(diff>0);
-console.error(`diff: ${diff}`);
+constdiff=endtime-starttime;
+assert.ok(diff>0);
+console.error(`diff: ${diff}`);
 
-assert.strictEqual(1000-WINDOW<diff&&diff<1000+WINDOW,true);
-}),1000);
+assert.strictEqual(1000-WINDOW<diff&&diff<1000+WINDOW,true);
+}),1000);
+}
 
 // This timer shouldn't execute
-constid=setTimeout(function(){assert.strictEqual(true,false);},500);
-clearTimeout(id);
+{
+constid=setTimeout(common.mustNotCall(),500);
+clearTimeout(id);
+}
 
-setInterval(function(){
-interval_count+=1;
-constendtime=newDate();
+{
+letinterval_count=0;
 
-constdiff=endtime-starttime;
-assert.ok(diff>0);
-console.error(`diff: ${diff}`);
+setInterval(common.mustCall(function(){
+interval_count+=1;
+constendtime=newDate();
 
-constt=interval_count*1000;
+constdiff=endtime-starttime;
+assert.ok(diff>0);
+console.error(`diff: ${diff}`);
 
-assert.strictEqual(t-WINDOW<diff&&diff<t+WINDOW,true);
+constt=interval_count*1000;
 
-assert.strictEqual(interval_count<=3,true);
-if(interval_count===3)
-clearInterval(this);
-},1000);
+assert.strictEqual(t-WINDOW<diff&&diff<t+WINDOW,true);
+
+assert.strictEqual(interval_count<=3,true);
+if(interval_count===3)
+clearInterval(this);
+},3),1000);
+}
 
 
 // Single param:
-setTimeout(function(param){
-assert.strictEqual(param,'test param');
-},1000,'test param');
+{
+setTimeout(function(param){
+assert.strictEqual(param,'test param');
+},1000,'test param');
+}
 
-letinterval_count2=0;
-setInterval(function(param){
-++interval_count2;
-assert.strictEqual(param,'test param');
+{
+letinterval_count=0;
+setInterval(function(param){
+++interval_count;
+assert.strictEqual(param,'test param');
 
-if(interval_count2===3)
-clearInterval(this);
-},1000,'test param');
+if(interval_count===3)
+clearInterval(this);
+},1000,'test param');
+}
 
 
 // Multiple param
-setTimeout(function(param1,param2){
-assert.strictEqual(param1,'param1');
-assert.strictEqual(param2,'param2');
-},1000,'param1','param2');
+{
+setTimeout(function(param1,param2){
+assert.strictEqual(param1,'param1');
+assert.strictEqual(param2,'param2');
+},1000,'param1','param2');
+}
 
-letinterval_count3=0;
-setInterval(function(param1,param2){
-++interval_count3;
-assert.strictEqual(param1,'param1');
-assert.strictEqual(param2,'param2');
+{
+letinterval_count=0;
+setInterval(function(param1,param2){
+++interval_count;
+assert.strictEqual(param1,'param1');
+assert.strictEqual(param2,'param2');
 
-if(interval_count3===3)
-clearInterval(this);
-},1000,'param1','param2');
+if(interval_count===3)
+clearInterval(this);
+},1000,'param1','param2');
+}
 
 // setInterval(cb, 0) should be called multiple times.
-letcount4=0;
-constinterval4=setInterval(function(){
-if(++count4>10)clearInterval(interval4);
-},0);
-
-
-// We should be able to clearTimeout multiple times without breakage.
-letexpectedTimeouts=3;
-
-functiont(){
-expectedTimeouts--;
+{
+letcount=0;
+constinterval=setInterval(common.mustCall(function(){
+if(++count>10)clearInterval(interval);
+},11),0);
 }
 
-setTimeout(t,200);
-setTimeout(t,200);
-consty=setTimeout(t,200);
-
-clearTimeout(y);
-setTimeout(t,200);
-clearTimeout(y);
-
+// We should be able to clearTimeout multiple times without breakage.
+{
+constt=common.mustCall(3);
 
-process.on('exit',function(){
-assert.strictEqual(interval_count,3);
-assert.strictEqual(count4,11);
+setTimeout(t,200);
+setTimeout(t,200);
+consty=setTimeout(t,200);
 
-// Check that the correct number of timers ran.
-assert.strictEqual(expectedTimeouts,0);
-});
+clearTimeout(y);
+setTimeout(t,200);
+clearTimeout(y);
+}