xvfb: clear close timeout

Author: pimlie

src/commands/xvfb.js

@@ -97,7 +97,7 @@ export default class Xvfb {
         const error = stderr.match(/\(EE\) (?!\(EE\))(.+?)$/m)[1] || stderr
         if (stderr.includes('already active for display')) {
           if (!quiet) {
-            console.warn(`Xvfb: ${error}`) // eslint-disable-line no-console
+            console.warn(`Xvfb: ${error}`, Xvfb.process.pid) // eslint-disable-line no-console
           }
           return
         }
@@ -110,7 +110,7 @@ export default class Xvfb {
   }
 
   static stop() {
-    if (!Xvfb.isRunning()) {
+    if (!Xvfb.process || Xvfb.closed) {
       return
     }
 
@@ -119,17 +119,19 @@ export default class Xvfb {
     // enable timers if they where faked by a test framework
     enableTimers()
 
+    let closeTimeout
     const waitTimeout = new Promise((resolve) => {
-      const timeout = setTimeout(() => {
+      closeTimeout = setTimeout(() => {
         consola.warn(`Timeout: Xvfb did not exit after 3s`)
         resolve()
       }, 3000)
-      timeout.unref()
+      closeTimeout.unref()
     })
 
     const waitClosed = new Promise((resolve) => {
       const closeInterval = setInterval(() => {
         if (Xvfb.closed) {
+          clearTimeout(closeTimeout)
           clearInterval(closeInterval)
           resolve()
         }

test/unit/command.xvfb.test.js

@@ -207,6 +207,7 @@ Fatal server error:
   })
 
   test('should wait on stop for closed to be true', async () => {
+    const spy = jest.spyOn(console, 'warn').mockImplementation(() => {})
     jest.useFakeTimers()
 
     Xvfb.process = true
@@ -217,6 +218,9 @@ Fatal server error:
     jest.advanceTimersByTime(100)
 
     await expect(stopPromise).resolves.toBeUndefined()
+
+    jest.advanceTimersByTime(3100)
+    expect(spy).not.toHaveBeenCalled()
   })
 
   test('should timeout on stop', async () => {
@@ -227,9 +231,6 @@ Fatal server error:
     Xvfb.closed = false
 
     const stopPromise = Xvfb.stop()
-    Xvfb.closed = true
-    jest.advanceTimersByTime(100)
-    await expect(stopPromise).not.resolves
 
     jest.advanceTimersByTime(3100)
     await expect(stopPromise).resolves.toBeUndefined()