ping_type & worker tests

Author: rosahbruno

glean/src/core/pings/ping_type.ts

@@ -114,9 +114,7 @@ export class InternalPingType implements CommonPingData {
   }
 
   /// TESTING ///
-  // TODO
-  // Does this need to go away?
-  testBeforeNextSubmit(callbackFn: ValidatorFunction): void {
+  async testBeforeNextSubmit(callbackFn: ValidatorFunction): Promise<void> {
     if (testOnlyCheck("testBeforeNextSubmit", LOG_TAG)) {
       if (this.testCallback) {
         log(
@@ -127,7 +125,11 @@ export class InternalPingType implements CommonPingData {
         return;
       }
 
-      this.testCallback = callbackFn;
+      return new Promise((resolve, reject) => {
+        this.resolveTestPromiseFunction = resolve;
+        this.rejectTestPromiseFunction = reject;
+        this.testCallback = callbackFn;
+      });
     }
   }
 }
@@ -161,8 +163,6 @@ export default class {
     this.#inner.submit(reason);
   }
 
-  // TODO
-  // Does this need to go away?
   /**
    * Test-only API
    *
@@ -173,7 +173,7 @@ export default class {
    * @returns A `Promise` resolved when the ping is collected and the validation function
    *          is executed.
    */
-  testBeforeNextSubmit(callbackFn: ValidatorFunction): void {
+  testBeforeNextSubmit(callbackFn: ValidatorFunction): Promise<void> {
     return this.#inner.testBeforeNextSubmit(callbackFn);
   }
 }

glean/src/core/upload/worker.ts

@@ -130,28 +130,35 @@ class PingUploadWorker {
     getUploadTask: () => UploadTask,
     processUploadResponse: (ping: QueuedPing, result: UploadResult) => void
   ): void {
-    try {
-      const task = getUploadTask();
-      switch (task.type) {
-      case UploadTaskTypes.Upload:
-        if (this.isBlocking) {
-          return;
+    while (true) {
+      try {
+        const task = getUploadTask();
+        switch (task.type) {
+        case UploadTaskTypes.Upload: {
+          if (this.isBlocking) {
+            return;
+          }
+
+          this.attemptPingUpload(task.ping)
+            .then((result) => {
+              processUploadResponse(task.ping, result);
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+          continue;
         }
 
-        this.attemptPingUpload(task.ping)
-          .then((result) => {
-            processUploadResponse(task.ping, result);
-          })
-          .catch((error) => {
-            console.log(error);
-          });
+        case UploadTaskTypes.Done:
+          return;
+        }
+      } catch (error) {
+        log(
+          PING_UPLOAD_WORKER_LOG_TAG,
+          ["IMPOSSIBLE: Something went wrong while processing ping upload tasks.", error],
+          LoggingLevel.Error
+        );
       }
-    } catch (error) {
-      log(
-        PING_UPLOAD_WORKER_LOG_TAG,
-        ["IMPOSSIBLE: Something went wrong while processing ping upload tasks.", error],
-        LoggingLevel.Error
-      );
     }
   }