Unverified Commit de50b345 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #232031 from nikstur/fix-rshim-service 

Fix rshim service
parents a19194af 46dfed60

nixos/modules/services/misc/rshim.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
let

  cfg = config.services.rshim;



  rshimCommand = lib.escapeShellArgs ([ "${cfg.package}/bin/rshim" ]

  rshimCommand = [ "${cfg.package}/bin/rshim" ]

    ++ lib.optionals (cfg.backend != null) [ "--backend ${cfg.backend}" ]

    ++ lib.optionals (cfg.device != null) [ "--device ${cfg.device}" ]

    ++ lib.optionals (cfg.index != null) [ "--index ${builtins.toString cfg.index}" ]

    ++ [ "--log-level ${builtins.toString cfg.log-level}" ])

    ++ [ "--log-level ${builtins.toString cfg.log-level}" ]

  ;

in

{

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ in { 
  retroarch = handleTest ./retroarch.nix {};

  robustirc-bridge = handleTest ./robustirc-bridge.nix {};

  roundcube = handleTest ./roundcube.nix {};

  rshim = handleTest ./rshim.nix {};

  rspamd = handleTest ./rspamd.nix {};

  rss2email = handleTest ./rss2email.nix {};

  rstudio-server = handleTest ./rstudio-server.nix {};

nixos/tests/rshim.nix

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem

, config ? { }

, pkgs ? import ../.. { inherit system config; }

}:



with import ../lib/testing-python.nix { inherit system pkgs; };

with pkgs.lib;



{

  basic = makeTest {

    name = "rshim";

    meta.maintainers = with maintainers; [ nikstur ];



    nodes.machine = { config, pkgs, ... }: {

      services.rshim.enable = true;

    };



    testScript = { nodes, ... }: ''

      machine.start()

      machine.wait_for_unit("multi-user.target")



      print(machine.succeed("systemctl status rshim.service"))

    '';

  };

}