test: Check for uptime in confirmation dialogs

This behaves differently depending on whether or not the session is privileged to read the log file. Add an invisible span to the dialog so that the test has something to wait for.
cockpit-project · Jan 5, 2024 · 8e04059 · 8e04059
1 parent cd35e5a
commit 8e04059
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/components/vm/confirmDialog.jsx b/src/components/vm/confirmDialog.jsx
@@ -64,13 +64,16 @@ export const ConfirmDialog = ({ idPrefix, actionsList, title, titleIcon, vm }) =
             titleIconVariant={titleIcon}
             isOpen
             footer={actions}>
-            {uptime &&
-            <DescriptionList isHorizontal isFluid>
-                <DescriptionListGroup>
-                    <DescriptionListTerm>{_("Uptime")}</DescriptionListTerm>
-                    <DescriptionListDescription id="uptime">{distanceToNow(new Date(uptime))}</DescriptionListDescription>
-                </DescriptionListGroup>
-            </DescriptionList>}
+            {uptime
+                ? <DescriptionList isHorizontal isFluid>
+                    <DescriptionListGroup>
+                        <DescriptionListTerm>{_("Uptime")}</DescriptionListTerm>
+                        <DescriptionListDescription id="uptime">{distanceToNow(new Date(uptime))}</DescriptionListDescription>
+                    </DescriptionListGroup>
+                </DescriptionList>
+                /* for tests */
+                : <span className="uptime-not-available" />
+            }
         </Modal>
     );
 };
diff --git a/test/check-machines-lifecycle b/test/check-machines-lifecycle
@@ -235,6 +235,12 @@ class TestMachinesLifecycle(VirtualMachinesCase):
         # Check uptime
         b.click("#vm-subVmTest2-system-shutdown-button")
         b.wait_visible("#vm-subVmTest2-system-confirm-action-modal")
+        # it starts with "less than a minute", so this should be reasonably race free
+        if superuser:
+            b.wait_in_text("#uptime", "minute")
+        else:
+            # unprivileged sessions can't read the log
+            b._wait_present(".uptime-not-available")
         if run_pixel_tests:
             b.assert_pixels("#vm-subVmTest2-system-confirm-action-modal", "shutdown-confirm-dialog")
         b.click(".pf-v5-c-modal-box__footer button:contains(Cancel)")