mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
Merge pull request #232031 from nikstur/fix-rshim-service
Fix rshim service
This commit is contained in:
commit
de50b3458e
@ -3,11 +3,11 @@
|
|||||||
let
|
let
|
||||||
cfg = config.services.rshim;
|
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.backend != null) [ "--backend ${cfg.backend}" ]
|
||||||
++ lib.optionals (cfg.device != null) [ "--device ${cfg.device}" ]
|
++ lib.optionals (cfg.device != null) [ "--device ${cfg.device}" ]
|
||||||
++ lib.optionals (cfg.index != null) [ "--index ${builtins.toString cfg.index}" ]
|
++ 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
|
in
|
||||||
{
|
{
|
||||||
|
@ -644,6 +644,7 @@ in {
|
|||||||
retroarch = handleTest ./retroarch.nix {};
|
retroarch = handleTest ./retroarch.nix {};
|
||||||
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
|
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
|
||||||
roundcube = handleTest ./roundcube.nix {};
|
roundcube = handleTest ./roundcube.nix {};
|
||||||
|
rshim = handleTest ./rshim.nix {};
|
||||||
rspamd = handleTest ./rspamd.nix {};
|
rspamd = handleTest ./rspamd.nix {};
|
||||||
rss2email = handleTest ./rss2email.nix {};
|
rss2email = handleTest ./rss2email.nix {};
|
||||||
rstudio-server = handleTest ./rstudio-server.nix {};
|
rstudio-server = handleTest ./rstudio-server.nix {};
|
||||||
|
25
nixos/tests/rshim.nix
Normal file
25
nixos/tests/rshim.nix
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{ 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"))
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user