Cleanup xvfb kill

Change-Id: Ic027d6cea2ac2bf080147d9eaf37f22739b186e3

Author: soulgalore

lib/support/xvfb.js

@@ -42,7 +42,8 @@ export async function startXvfb({ size, options }) {
   });
 
   const xvfbProcess = execa(command, args, {
-    stdio: silent ? 'ignore' : 'inherit'
+    stdio: silent ? 'ignore' : 'inherit',
+    forceKillAfterDelay: 1000
   });
 
   xvfbProcess.catch(error => {
@@ -68,21 +69,10 @@ export async function stopXvfb(xvfbSession) {
   }
 
   try {
-    xvfbSession.process.kill('SIGTERM');
+    xvfbSession.process.kill();
   } catch {
     // Just swallow
   }
-
-  const timeout = 1000;
-  const start = Date.now();
-  while (Date.now() - start < timeout) {
-    try {
-      process.kill(xvfbSession.process.pid, 0);
-      await new Promise(resolve => setTimeout(resolve, 100));
-    } catch {
-      return;
-    }
-  }
 }
 
 export class XVFB {