Unverified Commit 52c91284 authored by Bobby Rong's avatar Bobby Rong
Browse files

nixos/tests/pantheon: Pgrep io.elementary.files.xdg-desktop-portal 

Hopefully this is less flaky.
parent c5af5c95

nixos/tests/pantheon-wayland.nix

+1 −2
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ import ./make-test-python.nix ( 
            # https://github.com/elementary/gala/pull/2140

            for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "gsd-xsettings", "io.elementary.desktop.agent-polkit"]:

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

            for i in ["io.elementary.files.xdg-desktop-portal.service"]:

                machine.wait_for_unit(i, "${user.name}")

            machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")



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

            cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"

nixos/tests/pantheon.nix

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : 
            machine.wait_until_succeeds(f"pgrep -f {i}")

        for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock"]:

            machine.wait_for_window(i)

        for i in ["io.elementary.files.xdg-desktop-portal.service"]:

            machine.wait_for_unit(i, "${user.name}")

        machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal")



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

        cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"