fix: isWUComplete fails for compile + Attach

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Oct 26, 2023 · af478fd · af478fd
1 parent e8db09d
commit af478fd
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 23 deletions.
diff --git a/packages/comms/src/ecl/workunit.ts b/packages/comms/src/ecl/workunit.ts
@@ -424,6 +424,10 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
 
     async refreshState(): Promise<this> {
         await this.WUQuery();
+        // Ensure "isComplete" is correct for WUs that are only "Compiled".
+        if (this.StateID === WUStateID.Compiled && !this.ActionEx && !this._submitAction) {
+            await this.refreshInfo();
+        }
         return this;
     }
 

diff --git a/tests/test-comms/.vscode/launch.json b/tests/test-comms/.vscode/launch.json
@@ -6,29 +6,9 @@
     "configurations": [
         {
             "name": "Mocha Tests",
-            "type": "node",
-            "request": "launch",
-            "cwd": "${workspaceRoot}",
-            "runtimeExecutable": "${workspaceRoot}/../../node_modules/.bin/mocha",
-            "windows": {
-                "runtimeExecutable": "${workspaceRoot}/../../node_modules/.bin/mocha.cmd"
-            },
-            "linux": {
-                "runtimeExecutable": "${workspaceRoot}/../../node_modules/.bin/mocha"
-            },
-            "runtimeArgs": [
-                "-u",
-                "tdd",
-                "--timeout",
-                "999999",
-                "--colors",
-                "--exit",
-                "${workspaceRoot}/lib-umd/index.node.spec.js"
-            ],
-            "internalConsoleOptions": "openOnSessionStart",
-            "outFiles": [
-                "${workspaceRoot}/build/**/*"
-            ]
+            "type": "node-terminal",
+            "command": "npm run test:node && exit",
+            "request": "launch"
         },
         {
             "name": "Launch Edge",

diff --git a/tests/test-comms/src/ecl/workunit.spec.ts b/tests/test-comms/src/ecl/workunit.spec.ts
@@ -272,4 +272,28 @@ allPeople;
                 });
         });
     });
+
+    describe.only("Compile + watchUntilComplete", function () {
+        it("Simple", function () {
+            return Workunit.compile({ baseUrl: ESP_URL }, "hthor", "'Hello and Welcome!';").then((wu) => {
+                return wu.watchUntilComplete();
+            }).then((wu) => {
+                return wu.delete();
+            }).catch((e) => {
+                logger.debug(e);
+            });
+        });
+
+        it("Compile + Attach", function () {
+            return Workunit.compile({ baseUrl: ESP_URL }, "hthor", "'Hello and Welcome!';").then((wu) => {
+                return Workunit.attach({ baseUrl: ESP_URL }, wu.Wuid);
+            }).then(wu => {
+                return wu.watchUntilComplete();
+            }).then((wu) => {
+                return wu.delete();
+            }).catch((e) => {
+                logger.debug(e);
+            });
+        });
+    });
 });