Merge pull request #394 from dcmjs-org/fix/race-condition-test

test: Race condition test

Author: wayfarer3130

test/testUtils.js

@@ -55,22 +55,31 @@ function ensureTestDataDir() {
 }
 
 async function getZippedTestDataset(url, filename, unpackDirectory) {
-    var dir = ensureTestDataDir();
-    var targetPath = path.join(dir, filename);
-    var unpackPath = path.join(dir, unpackDirectory);
+    const dir = ensureTestDataDir();
+    const targetPath = path.join(dir, filename);
+    const unpackPath = path.join(dir, unpackDirectory);
     if (!fs.existsSync(unpackPath)) {
         await downloadToFile(url, targetPath);
         await unzip(targetPath, unpackPath);
     }
     return unpackPath;
 }
 
+/**
+ * Stores the required downloads to prevent async reading before download completed.
+ */
+const asyncDownloadMap = new Map();
+
 async function getTestDataset(url, filename) {
-    var dir = ensureTestDataDir();
-    var targetPath = path.join(dir, filename);
-    if (!fs.existsSync(targetPath)) {
-        await downloadToFile(url, targetPath);
+    const dir = ensureTestDataDir();
+    const targetPath = path.join(dir, filename);
+    let filePromise = asyncDownloadMap.get(targetPath);
+    if (!filePromise && !fs.existsSync(targetPath)) {
+        filePromise = downloadToFile(url, targetPath);
+        asyncDownloadMap.set(targetPath,filePromise);
     }
+    // This returns immediately if filePromise is undefined - eg if the file already downloaded.
+    await filePromise;
     return targetPath;
 }