test: bound vim harness cleanup

Author: mitermayer

tests/formatting.test.js

@@ -251,6 +251,14 @@ const expectNoPluginFlags = flags => {
 const countPluginFlags = flags => (flags.match(/--plugin=/g) || []).length;
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
+const timeoutAfter = (promise, ms) => {
+  let timeout;
+  const timeoutPromise = new Promise((_, reject) => {
+    timeout = setTimeout(() => reject(new Error(`Timed out after ${ms}ms`)), ms);
+  });
+
+  return Promise.race([promise, timeoutPromise]).finally(() => clearTimeout(timeout));
+};
 const waitUntil = (condition, timeout = 2000) => {
   return new Promise(resolve => {
     let isTimedOut = false;
@@ -346,18 +354,17 @@ afterEach(async () => {
   try {
     if (remote.isConnected()) {
       try {
-        const filename = await remote.call('expand', ['%:p']);
+        const filename = await timeoutAfter(remote.call('expand', ['%:p']), 5000);
 
         if (filename) {
           // restore the file
-          await remote.execute('earlier 1d | noautocmd | write');
+          await timeoutAfter(remote.execute('earlier 1d | noautocmd | write'), 5000);
         }
       } catch (e) {
-      } finally {
-        await remote.close();
       }
     }
   } finally {
+    await timeoutAfter(remote.close(), 5000).catch(() => {});
     cleanupTempProjects();
   }
 });

tests/vim-driver/HeadlessRemoteClient.js

@@ -121,12 +121,17 @@ class HeadlessRemoteClient {
   }
 
   async close() {
-    this._assertConnected('close');
-    await this._remote.close();
-    if (this._vimProcess != null) {
-      await this._vimProcess.kill();
+    try {
+      if (this._remote != null) {
+        await this._remote.close();
+      }
+    } finally {
+      if (this._vimProcess != null) {
+        await this._vimProcess.kill();
+        this._vimProcess = null;
+      }
+      this._unassignRemote();
     }
-    this._unassignRemote();
     return this;
   }
 

tests/vim-driver/VimProcess.js

@@ -73,18 +73,36 @@ class VimProcess {
         resolve(this);
         return;
       }
-      const onClose = () => {
-        child.removeListener('close', onClose);
-        child.removeListener('exit', onClose);
+      let resolved = false;
+      let killTimeout;
+      const finish = () => {
+        if (resolved) {
+          return;
+        }
+        resolved = true;
+        clearTimeout(killTimeout);
+        child.removeListener('close', finish);
+        child.removeListener('exit', finish);
         resolve(this);
       };
+      const onClose = () => {
+        finish();
+      };
       child.addListener('close', onClose);
       child.addListener('exit', onClose);
       try {
         global.process.kill(-child.pid, 'SIGTERM');
       } catch (error) {
         child.kill();
       }
+      killTimeout = setTimeout(() => {
+        try {
+          global.process.kill(-child.pid, 'SIGKILL');
+        } catch (error) {
+          child.kill('SIGKILL');
+        }
+        finish();
+      }, 2000);
     });
   }
 }