Unverified Commit 7db3b7c2 authored by Bobby Rong's avatar Bobby Rong
Browse files

nixosTests.mate-wayland: Check for more text 

* As long as the dialog shows everything is fine, make the test less flaky.
* Also use `pgrep` instead of `pgrep -f` when possible.
parent 852ff1d9

nixos/tests/mate-wayland.nix

+5 −4
Original line number Diff line number Diff line
@@ -42,10 +42,11 @@ import ./make-test-python.nix ( 
            machine.wait_for_file("/run/user/${toString user.uid}/wayland-1")



        with subtest("Check if MATE session components actually start"):

            for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]:

                machine.wait_until_succeeds(f"pgrep -f {i}")

            # It is expected that this applet doesn't work in Wayland

            machine.wait_for_text('WorkspaceSwitcherApplet')

            for i in ["wayfire", "mate-panel", "mate-wayland.sh"]:

                machine.wait_until_succeeds(f"pgrep {i}")

            machine.wait_until_succeeds("pgrep -f mate-wayland-components.sh")

            # It is expected that WorkspaceSwitcherApplet doesn't work in Wayland

            machine.wait_for_text('(panel|Factory|Workspace|Switcher|Applet|configuration)')



        with subtest("Check if various environment variables are set"):

            cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ"