From 22c8b9cb16fa451e67f2e64e68e7d4cb1ba473d5 Mon Sep 17 00:00:00 2001
From: Michael Rose <michael_rose@gmx.de>
Date: Wed, 16 Jun 2021 10:45:56 +0200
Subject: [PATCH] fix(test): flaky snippet manager tests

---
 packages/snippet-manager/src/snippet-manager.spec.ts | 6 ++++++
 packages/snippet-manager/src/snippet-manager.ts      | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/snippet-manager/src/snippet-manager.spec.ts b/packages/snippet-manager/src/snippet-manager.spec.ts
index 25f28f4790..bc57781dcf 100644
--- a/packages/snippet-manager/src/snippet-manager.spec.ts
+++ b/packages/snippet-manager/src/snippet-manager.spec.ts
@@ -386,6 +386,7 @@ describe('SnippetManager', () => {
   });
 
   it('will fail when the index URI is inaccessible', async() => {
+    await snippetManager.inflightFetchIndexPromise;
     try {
       indexURL = `${baseURL}/404`;
       await snippetManager.runSnippetCommand(['refresh']);
@@ -396,6 +397,7 @@ describe('SnippetManager', () => {
   });
 
   it('will fail when the index URI returns data in the wrong format (not .br)', async() => {
+    await snippetManager.inflightFetchIndexPromise;
     try {
       indexURL = `${baseURL}/notindexfile`;
       await snippetManager.runSnippetCommand(['refresh']);
@@ -406,6 +408,7 @@ describe('SnippetManager', () => {
   });
 
   it('will fail when the index URI returns data in the wrong format (not .bson.br)', async() => {
+    await snippetManager.inflightFetchIndexPromise;
     try {
       indexURL = `${baseURL}/notindexfile2`;
       await snippetManager.runSnippetCommand(['refresh']);
@@ -537,6 +540,7 @@ describe('SnippetManager', () => {
   });
 
   it('can install from a tarball', async() => {
+    await snippetManager.inflightFetchIndexPromise;
     indexURL = `${baseURL}/index.bson.br;${baseURL}/index2.bson.br;`;
     (evaluationListener.onPrompt as any).resolves('yes');
     await snippetManager.runSnippetCommand(['install', 'tarballed-example']);
@@ -544,6 +548,7 @@ describe('SnippetManager', () => {
   });
 
   it('reports back errors if npm fails', async() => {
+    await snippetManager.inflightFetchIndexPromise;
     indexURL = `${baseURL}/index.bson.br;${baseURL}/index2.bson.br;`;
     (evaluationListener.onPrompt as any).resolves('yes');
     try {
@@ -724,6 +729,7 @@ describe('SnippetManager', () => {
 
   describe('interruption support', () => {
     it('commands methods like load-all perform interruption checkpoints', async() => {
+      await snippetManager.inflightFetchIndexPromise;
       indexURL = `${baseURL}/index.bson.br;${baseURL}/index2.bson.br;`;
       await snippetManager.runSnippetCommand(['refresh']);
 
diff --git a/packages/snippet-manager/src/snippet-manager.ts b/packages/snippet-manager/src/snippet-manager.ts
index a7c25effae..ad1117aa14 100644
--- a/packages/snippet-manager/src/snippet-manager.ts
+++ b/packages/snippet-manager/src/snippet-manager.ts
@@ -414,10 +414,13 @@ export class SnippetManager implements ShellPlugin {
         } else {
           output = await this.runNpm(args[0]);
         }
+
+        const firstLineEnd = output.indexOf('\n');
+        let packages = output.substr(firstLineEnd + 1);
         for (const { name, snippetName } of this.snippets) {
-          output = output.replace(new RegExp(escapeRegexp(name), 'g'), `mongosh:${snippetName}`);
+          packages = packages.replace(new RegExp(escapeRegexp(name), 'g'), `mongosh:${snippetName}`);
         }
-        return output;
+        return (firstLineEnd < 0 ? output : output.substr(0, firstLineEnd + 1)) + packages;
       }
       case 'search':
         return await this.search();