Remove majority of fake timers use while testing

phillipj · phillipj · commit e34a7c8f65e5 · 2020-04-14T14:34:15.000+02:00
As a precursor to running test assertions after we *know* all work has
been done, most our use of fake timers gets removed here as it will
not be needed anymore and even causes some challenges not easily solved
when requests starts hanging due to work not having finished yet and
the culprit is timers not running as they normally do.
diff --git a/test/integration/node-labels-webhook.test.js b/test/integration/node-labels-webhook.test.js
@@ -5,7 +5,6 @@ const url = require('url')
 const nock = require('nock')
 const supertest = require('supertest')
 const proxyquire = require('proxyquire')
-const lolex = require('lolex')
 
 const testStubs = {
   './github-secret': {
@@ -24,7 +23,6 @@ const readFixture = require('../read-fixture')
 setupNoRequestMatchHandler()
 
 tap.test('Sends POST request to https://api.github.com/repos/nodejs/node/issues/<PR-NUMBER>/labels', (t) => {
-  const clock = lolex.install()
   const expectedLabels = ['timers']
   const webhookPayload = readFixture('pull-request-opened.json')
 
@@ -48,7 +46,6 @@ tap.test('Sends POST request to https://api.github.com/repos/nodejs/node/issues/
     filesScope.done()
     existingRepoLabelsScope.done()
     newLabelsScope.done()
-    clock.uninstall()
   })
 
   supertest(app)
@@ -57,13 +54,11 @@ tap.test('Sends POST request to https://api.github.com/repos/nodejs/node/issues/
     .send(webhookPayload)
     .expect(200)
     .end((err, res) => {
-      clock.runAll()
       t.equal(err, null)
     })
 })
 
 tap.test('Adds v6.x label when PR is targeting the v6.x-staging branch', (t) => {
-  const clock = lolex.install()
   const expectedLabels = ['timers', 'v6.x']
   const webhookPayload = readFixture('pull-request-opened-v6.x.json')
 
@@ -87,7 +82,6 @@ tap.test('Adds v6.x label when PR is targeting the v6.x-staging branch', (t) =>
     filesScope.done()
     existingRepoLabelsScope.done()
     newLabelsScope.done()
-    clock.uninstall()
   })
 
   supertest(app)
@@ -96,14 +90,12 @@ tap.test('Adds v6.x label when PR is targeting the v6.x-staging branch', (t) =>
     .send(webhookPayload)
     .expect(200)
     .end((err, res) => {
-      clock.runAll()
       t.equal(err, null)
     })
 })
 
 // reported bug: https://github.com/nodejs/github-bot/issues/58
 tap.test('Does not create labels which does not already exist', (t) => {
-  const clock = lolex.install()
   const webhookPayload = readFixture('pull-request-opened-mapproxy.json')
 
   const filesScope = nock('https://api.github.com')
@@ -120,7 +112,6 @@ tap.test('Does not create labels which does not already exist', (t) => {
   t.tearDown(() => {
     filesScope.done()
     existingRepoLabelsScope.done()
-    clock.uninstall()
   })
 
   supertest(app)
@@ -129,14 +120,12 @@ tap.test('Does not create labels which does not already exist', (t) => {
     .send(webhookPayload)
     .expect(200)
     .end((err, res) => {
-      clock.runAll()
       t.equal(err, null)
     })
 })
 
 // reported bug: https://github.com/nodejs/github-bot/issues/92
 tap.test('Adds V8 Engine label when PR has deps/v8 file changes', (t) => {
-  const clock = lolex.install()
   const expectedLabels = ['V8 Engine']
   const webhookPayload = readFixture('pull-request-opened-v8.json')
 
@@ -160,7 +149,6 @@ tap.test('Adds V8 Engine label when PR has deps/v8 file changes', (t) => {
     filesScope.done()
     existingRepoLabelsScope.done()
     newLabelsScope.done()
-    clock.uninstall()
   })
 
   supertest(app)
@@ -169,7 +157,6 @@ tap.test('Adds V8 Engine label when PR has deps/v8 file changes', (t) => {
     .send(webhookPayload)
     .expect(200)
     .end((err, res) => {
-      clock.runAll()
       t.equal(err, null)
     })
 })
diff --git a/test/integration/trigger-jenkins-build.test.js b/test/integration/trigger-jenkins-build.test.js
@@ -5,7 +5,6 @@ const url = require('url')
 const nock = require('nock')
 const supertest = require('supertest')
 const proxyquire = require('proxyquire')
-const lolex = require('lolex')
 const readFixture = require('../read-fixture')
 
 const app = proxyquire('../../app', {
@@ -19,8 +18,6 @@ const app = proxyquire('../../app', {
 })
 
 tap.test('Sends POST request to https://ci.nodejs.org', (t) => {
-  const clock = lolex.install()
-
   const originalJobUrlValue = process.env.JENKINS_JOB_URL_NODE
   const originalTokenValue = process.env.JENKINS_BUILD_TOKEN_NODE
   process.env.JENKINS_JOB_NODE = 'node-test-pull-request-lite-pipeline'
@@ -48,7 +45,6 @@ tap.test('Sends POST request to https://ci.nodejs.org', (t) => {
     collaboratorsScope.done()
     ciJobScope.done()
     commentScope.done()
-    clock.uninstall()
   })
 
   supertest(app)
@@ -59,7 +55,6 @@ tap.test('Sends POST request to https://ci.nodejs.org', (t) => {
     .end((err, res) => {
       process.env.JENKINS_JOB_URL_NODE = originalJobUrlValue
       process.env.JENKINS_BUILD_TOKEN_NODE = originalTokenValue
-      clock.runAll()
       t.equal(err, null)
     })
 })
diff --git a/test/unit/node-repo.test.js b/test/unit/node-repo.test.js
@@ -1,9 +1,9 @@
 'use strict'
 
-const lolex = require('lolex')
 const proxyquire = require('proxyquire')
 const sinon = require('sinon')
 const tap = require('tap')
+const lolex = require('lolex')
 
 const logger = require('../../lib/logger')
 const githubClient = require('../../lib/github-client')
