fix: Don't hang when git is not found

getappmap · Feb 22, 2023 · d2faa86 · d2faa86
1 parent 517ca64
commit d2faa86
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/telemetry/telemetry.spec.ts b/packages/telemetry/telemetry.spec.ts
@@ -2,8 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import sinon, { SinonSpy } from 'sinon';
 import Conf from 'conf';
-import Telemetry, { Git } from './telemetry';
+import Telemetry, { Git, GitState } from './telemetry';
 import { name as appName, version } from './package.json';
+import child_process, { ChildProcess } from 'node:child_process';
+import { nextTick } from 'node:process';
 
 const invalidExpiration = () => Date.now() - 1000 * 60 * 60;
 
@@ -178,5 +180,17 @@ describe('telemetry', () => {
         expect(await Git.contributors(sinceDaysAgo)).toEqual(firstResult);
       }
     });
+
+    describe('state', () => {
+      it('returns NotInstalled on error', () => {
+        jest.spyOn(child_process, 'spawn').mockImplementation(() => {
+          const cp = new ChildProcess();
+          nextTick(() => cp.emit('error', new Error('test error')));
+          return cp;
+        });
+
+        return expect(Git.state()).resolves.toEqual(GitState.NotInstalled);
+      });
+    });
   });
 });
diff --git a/packages/telemetry/telemetry.ts b/packages/telemetry/telemetry.ts
@@ -304,7 +304,7 @@ class GitProperties {
               return resolve(GitState.Ok);
           }
         });
-        commandProcess.on('error', () => GitState.NotInstalled);
+        commandProcess.on('error', () => resolve(GitState.NotInstalled));
       } catch {
         resolve(GitState.NotInstalled);
       }