movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.zwave-js: migrate to runTest

Browse source 
Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 22:39:30 +01:00
parent d8d1e397cb
commit 16cf246490
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 30 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -1320,6 +1320,6 @@ in {
zram-generator = handleTest ./zram-generator.nix {}; zram-generator = handleTest ./zram-generator.nix {};
zrepl = handleTest ./zrepl.nix {}; zrepl = handleTest ./zrepl.nix {};
zsh-history = handleTest ./zsh-history.nix {}; zsh-history = handleTest ./zsh-history.nix {};
zwave-js = handleTest ./zwave-js.nix {}; zwave-js = runTest ./zwave-js.nix;
zwave-js-ui = runTest ./zwave-js-ui.nix; zwave-js-ui = runTest ./zwave-js-ui.nix;
} }

16
nixos/tests/zwave-js.nix
View file

@ -1,7 +1,6 @@
import ./make-test-python.nix ( { pkgs, lib, ... }:
{ pkgs, lib, ... }:
let let
secretsConfigFile = pkgs.writeText "secrets.json" ( secretsConfigFile = pkgs.writeText "secrets.json" (
builtins.toJSON { builtins.toJSON {
securityKeys = { securityKeys = {
@ -9,15 +8,13 @@ import ./make-test-python.nix (
}; };
} }
); );
in in
{ {
name = "zwave-js"; name = "zwave-js";
meta.maintainers = with lib.maintainers; [ graham33 ]; meta.maintainers = with lib.maintainers; [ graham33 ];
nodes = { nodes = {
machine = machine = {
{ config, ... }:
{
services.zwave-js = { services.zwave-js = {
enable = true; enable = true;
serialPort = "/dev/null"; serialPort = "/dev/null";
@ -34,5 +31,4 @@ import ./make-test-python.nix (
machine.wait_for_open_port(3000) machine.wait_for_open_port(3000)
machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js --grep 'ZwaveJS server listening'") machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js --grep 'ZwaveJS server listening'")
''; '';
} }
)