HAL-1920 part 2: Fixing ManagementOperationsTest.cancelNonProgressing…

…Operation
hal · Nov 8, 2023 · d086cf0 · d086cf0
1 parent f0d95fe
commit d086cf0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/...boss/hal/testsuite/test/configuration/management/operations/ManagementOperationsTest.java b/...boss/hal/testsuite/test/configuration/management/operations/ManagementOperationsTest.java
@@ -100,7 +100,7 @@ public void cancelNonProgressingOperation() throws Exception {
         page.navigate();
         managementOps.waitForNonProgressingOperation(25);
         page.cancelNonProgressingOperation();
-        assertTrue(managementOps.thereIsNoNonProgressingOperationATM());
+        assertTrue(managementOps.areNonProgressiveOperationsCancelledATM());
 
         deployFuture.join();
     }

diff --git a/...main/java/org/jboss/hal/testsuite/tooling/management/operations/ManagementOperations.java b/...main/java/org/jboss/hal/testsuite/tooling/management/operations/ManagementOperations.java
@@ -49,16 +49,14 @@ public long waitForNonProgressingOperation(int timeoutInSeconds) throws IOExcept
         return Long.parseLong(nonProgressingOperationResult.stringValue());
     }
 
-    public boolean thereIsNoNonProgressingOperationATM() throws InterruptedException, IOException {
+    public boolean areNonProgressiveOperationsCancelledATM() throws InterruptedException, IOException {
         int timeoutInMilis = 220; // just to be sure all actions are propagated
         long startTime = System.currentTimeMillis();
-        ModelNodeResult nonProgressingOperationResult = findNonProgressingOperation();
-        while (nonProgressingOperationResult.hasDefinedValue()) {
+        while (!areNonProgressiveOperationsCancelled()) {
             if (System.currentTimeMillis() - startTime > timeoutInMilis) {
                 return false;
             }
             TimeUnit.MILLISECONDS.sleep(50);
-            nonProgressingOperationResult = findNonProgressingOperation();
         }
         return true;
     }
@@ -75,4 +73,20 @@ private ModelNodeResult findNonProgressingOperation() throws IOException {
         result.assertSuccess();
         return result;
     }
+
+    private boolean areNonProgressiveOperationsCancelled() throws IOException {
+        ModelNodeResult nonProgressingOperationResult = findNonProgressingOperation();
+        // just one operation is expected, improve this if needed
+        String operationId = nonProgressingOperationResult.get(RESULT).asStringOrNull();
+        if (operationId != null) {
+            return isActiveOperationCancelled(operationId);
+        }
+        return true;
+    }
+
+    private boolean isActiveOperationCancelled(String operationId) throws IOException {
+        ModelNodeResult result = ops.readAttribute(MANAGEMENT_OPERATIONS_ADDRESS.and(ACTIVE_OPERATION, operationId), CANCELLED);
+        result.assertSuccess();
+        return result.asBoolean();
+    }
 }