[BUG] Remote Dependency requests don't "always" have the correct ai.o…

…peration.id tag (page view race condition) #1862 (#1869)
microsoft · Aug 1, 2022 · 9176bc3 · 9176bc3
1 parent 200e0f1
commit 9176bc3
Show file tree

Hide file tree

Showing 10 changed files with 398 additions and 83 deletions.
diff --git a/AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts b/AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts
@@ -864,10 +864,12 @@ export class SnippetInitializationTests extends AITestClass {
             // Setup Sinon stuff
             const appInsights = (snippet as any).appInsights;
             this.onDone(() => {
-                if (snippet["unload"]) {
-                    snippet["unload"](false);
-                } else if (snippet["appInsightsNew"]) {
-                    snippet["appInsightsNew"].unload(false);
+                if (snippet) {
+                    if (snippet["unload"]) {
+                        snippet["unload"](false);
+                    } else if (snippet["appInsightsNew"]) {
+                        snippet["appInsightsNew"].unload(false);
+                    }
                 }
             });
 

diff --git a/common/Tests/Framework/src/AITestClass.ts b/common/Tests/Framework/src/AITestClass.ts
@@ -557,7 +557,7 @@ export class AITestClass {
     }
 
     protected onDone(cleanupFn: VoidFunction) {
-        if (cleanupFn) {
+        if (cleanupFn && this._onDoneFuncs) {
             this._onDoneFuncs.push(cleanupFn);
         }
     }
@@ -892,14 +892,17 @@ export class AITestClass {
     }
 
     private _testFinishedCleanup() {
-        this._onDoneFuncs.forEach((fn) => {
-            try {
-                fn();
-            } catch (e) {
-                // Do nothing during cleanup
-            }
-        });
+        let doneFuncs = this._onDoneFuncs;
         this._onDoneFuncs = [];
+        if (doneFuncs) {
+            doneFuncs.forEach((fn) => {
+                try {
+                    fn();
+                } catch (e) {
+                    // Do nothing during cleanup
+                }
+            });
+        }
 
         this.testFinishedCleanup();
     }

diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json