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

nixosTests.varnish{75,76,60}: migrate to runTest

Browse source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-03-30 18:22:15 +02:00
parent 494c90cb5d
commit 26497c8351
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 63 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1277,9 +1277,18 @@ in {
ustreamer = handleTest ./ustreamer.nix {}; ustreamer = handleTest ./ustreamer.nix {};
uwsgi = handleTest ./uwsgi.nix {}; uwsgi = handleTest ./uwsgi.nix {};
v2ray = handleTest ./v2ray.nix {}; v2ray = handleTest ./v2ray.nix {};
varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; varnish60 = runTest {
varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; }; imports = [ ./varnish.nix ];
varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; }; _module.args.package = pkgs.varnish60;
};
varnish75 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish75;
};
varnish76 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish76;
};
vault = handleTest ./vault.nix {}; vault = handleTest ./vault.nix {};
vault-agent = handleTest ./vault-agent.nix {}; vault-agent = handleTest ./vault-agent.nix {};
vault-dev = handleTest ./vault-dev.nix {}; vault-dev = handleTest ./vault-dev.nix {};

17
nixos/tests/varnish.nix
View file

@ -1,14 +1,8 @@
{ { pkgs, package, ... }:
system ? builtins.currentSystem, let
pkgs ? import ../.. { inherit system; },
package,
}:
import ./make-test-python.nix (
{ pkgs, lib, ... }:
let
testPath = pkgs.hello; testPath = pkgs.hello;
in in
{ {
name = "varnish"; name = "varnish";
meta = { meta = {
maintainers = [ ]; maintainers = [ ];
@ -63,5 +57,4 @@ import ./make-test-python.nix (
print(output) print(output)
assert "Child in state running" in output, "Unexpected varnishadm response" assert "Child in state running" in output, "Unexpected varnishadm response"
''; '';
} }
)