flutter: refactor waiting for window to go away

Better as a common keyword Co-authored-by Harlen Batagelo <[email protected]>
canonical · Dec 9, 2024 · 4d02e05 · 4d02e05
1 parent 002cf2c
commit 4d02e05
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/mir_flutter_app.robot b/mir-ci/mir_ci/tests/robot/suites/mir_flutter_app/mir_flutter_app.robot
@@ -259,36 +259,34 @@ Slide Constraint Precedes Resize
 
 
 *** Keywords ***
+Wait Until ${template} Is Absent
+    Wait Until Keyword Succeeds                     5                       1
+    ...                     Run Keyword And Expect Error                    ImageNotFoundError
+    ...                     VIDEO.Match             ${template}             0
+
 Close Focused Toplevel Window
     Move Pointer To (0, 0)
     ${pos}=                 Move Pointer To ${WINDOW_REGULAR_0_FOCUSED}
     ${pos}=                 Displace ${pos} By (130, 0)
     Move Pointer To ${pos}
     Click LEFT Button
-    Click LEFT Button
-    Wait Until Keyword Succeeds                     5                       1
-    ...                     Run Keyword And Expect Error                    ImageNotFoundError
-    ...                     VIDEO.Match             ${WINDOW_REGULAR_0_FOCUSED}                     0
+    Wait Until ${WINDOW_REGULAR_0_FOCUSED} Is Absent
 
 Close Floating Toplevel Window
     Move Pointer To (0, 0)
     ${pos}=                 Move Pointer To ${WINDOW_FLOATING_REGULAR_0_FOCUSED}
     ${pos}=                 Displace ${pos} By (138, 0)
     Move Pointer To ${pos}
     Click LEFT Button
-    Wait Until Keyword Succeeds                     5                       1
-    ...                     Run Keyword And Expect Error                    ImageNotFoundError
-    ...                     VIDEO.Match             ${WINDOW_FLOATING_REGULAR_0_FOCUSED}            0
+    Wait Until ${WINDOW_FLOATING_REGULAR_0_FOCUSED} Is Absent
 
 Close Dialog Window
     Move Pointer To (0, 0)
     ${pos}=                 Move Pointer To ${WINDOW_DIALOG_FOCUSED}
     ${pos}=                 Displace ${pos} By (112, 0)
     Move Pointer To ${pos}
     Click LEFT Button
-    Wait Until Keyword Succeeds                     5                       1
-    ...                     Run Keyword And Expect Error                    ImageNotFoundError
-    ...                     VIDEO.Match             ${WINDOW_DIALOG_FOCUSED}                        0
+    Wait Until ${WINDOW_DIALOG_FOCUSED} Is Absent
 
 Select ${preset} Positioner Preset
     ${vertical_distance_between_options}=           Set Variable            48