Unverified Commit 4131df3b authored by Bobby Rong's avatar Bobby Rong
Browse files

nixos/tests/{budgie,cinnamon,mate,pantheon}: Add tests for SSH_AUTH_SOCK 

As a follow-up to the previous commit.

Note that Pantheon is systemd managed so no hacks are needed.
parent cf39ba5e

nixos/tests/budgie.nix

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"

          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")

          machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")

          # From the nixos/budgie module

          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Open run dialog"):

          machine.send_key("alt-f2")

nixos/tests/cinnamon-wayland.nix

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ 
      with subtest("Check if sessionPath option actually works"):

          machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")



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

          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"

          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")

          machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")

          # From the nixos/cinnamon module

          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Open Cinnamon Settings"):

          machine.succeed("${su "cinnamon-settings themes >&2 &"}")

          machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")

nixos/tests/cinnamon.nix

+7 −0
Original line number Diff line number Diff line
@@ -69,6 +69,13 @@ 
      with subtest("Check if sessionPath option actually works"):

          machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")



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

          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"

          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'x11'")

          machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")

          # From the nixos/cinnamon module

          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Open Cinnamon Settings"):

          machine.succeed("${su "cinnamon-settings themes >&2 &"}")

          machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'")

nixos/tests/mate-wayland.nix

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
          machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")

          machine.succeed(f"{cmd} | grep 'XDG_SESSION_DESKTOP' | grep 'MATE'")

          machine.succeed(f"{cmd} | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")

          # From the nixos/mate module

          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Check if Wayfire config is properly configured"):

          for i in ["button_style = mate", "firedecor", "mate-wayland-components.sh"]:

nixos/tests/mate.nix

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf marco)/environ | grep 'XDG_CURRENT_DESKTOP' | grep 'MATE'")

          # From mate-panel-with-applets packaging

          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'MATE_PANEL_APPLETS_DIR' | grep '${pkgs.mate.mate-panel-with-applets.pname}'")

          # From the nixos/mate module

          machine.succeed("xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ | grep 'SSH_AUTH_SOCK' | grep 'gcr'")



      with subtest("Check if applets are built with in-process support"):

          # This is needed for Wayland support