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

nixosTests.calibre-server: migrate to runTest

Browse source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-05 18:35:52 +02:00
parent 0aa6ecb083
commit 38d86e4725
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -275,7 +275,7 @@ in
cage = handleTest ./cage.nix { }; cage = handleTest ./cage.nix { };
cagebreak = handleTest ./cagebreak.nix { }; cagebreak = handleTest ./cagebreak.nix { };
calibre-web = runTest ./calibre-web.nix; calibre-web = runTest ./calibre-web.nix;
calibre-server = handleTest ./calibre-server.nix { }; calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
canaille = handleTest ./canaille.nix { }; canaille = handleTest ./canaille.nix { };
castopod = handleTest ./castopod.nix { }; castopod = handleTest ./castopod.nix { };
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };

9
nixos/tests/calibre-server.nix
View file

@ -1,11 +1,10 @@
{ {
system ? builtins.currentSystem, pkgs,
config ? { }, runTest,
pkgs ? import ../.. { inherit system config; }, ...
}: }:
let let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib) inherit (pkgs.lib)
concatStringsSep concatStringsSep
maintainers maintainers
@ -74,7 +73,7 @@ let
in in
mapAttrs ( mapAttrs (
test: testConfig: test: testConfig:
(makeTest ( (runTest (
let let
nodeName = testConfig.nodeName or test; nodeName = testConfig.nodeName or test;
calibreConfig = { calibreConfig = {