Merge pull request #1388 from github/aeisenberg/fix-flaky-test

Arcane workaround to fix a flaky test

Author: aeisenberg

extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts

@@ -404,12 +404,26 @@ describe('query-history', () => {
 
     it('should get the selection from the treeView when both selections are empty', async () => {
       queryHistoryManager = await createMockQueryHistory(allHistory);
-      await queryHistoryManager.treeView.reveal(allHistory[1], { select: true });
-      const selection = (queryHistoryManager as any).determineSelection(undefined, undefined);
-      expect(selection).to.deep.eq({
-        finalSingleItem: allHistory[1],
-        finalMultiSelect: [allHistory[1]]
+      const p = new Promise<void>(done => {
+        queryHistoryManager!.treeView.onDidChangeSelection(s => {
+          if (s.selection[0] !== allHistory[1]) {
+            return;
+          }
+          const selection = (queryHistoryManager as any).determineSelection(undefined, undefined);
+          expect(selection).to.deep.eq({
+            finalSingleItem: allHistory[1],
+            finalMultiSelect: [allHistory[1]]
+          });
+          done();
+        });
       });
+
+      // I can't explain why, but the first time the onDidChangeSelection event fires, the selection is
+      // not correct (it is inexplicably allHistory[2]). So we fire the event a second time to get the
+      // correct selection.
+      await queryHistoryManager.treeView.reveal(allHistory[0], { select: true });
+      await queryHistoryManager.treeView.reveal(allHistory[1], { select: true });
+      await p;
     });
 
     it('should get the selection from the treeDataProvider when both selections and the treeView are empty', async () => {