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

nixos/tests/envoy: migrate to runTests

Browse source
This commit is contained in:
Adam C. Stephens 2025-03-31 17:17:52 -04:00
parent d237b5096b
commit 6ac38abf29
No known key found for this signature in database
2 changed files with 57 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -407,7 +407,10 @@ in
enlightenment = handleTest ./enlightenment.nix { }; enlightenment = handleTest ./enlightenment.nix { };
env = handleTest ./env.nix { }; env = handleTest ./env.nix { };
envfs = handleTest ./envfs.nix { }; envfs = handleTest ./envfs.nix { };
envoy = handleTest ./envoy.nix { }; envoy = runTest {
imports = [ ./envoy.nix ];
_module.args.envoyPackage = pkgs.envoy;
};
ergo = handleTest ./ergo.nix { }; ergo = handleTest ./ergo.nix { };
ergochat = handleTest ./ergochat.nix { }; ergochat = handleTest ./ergochat.nix { };
eris-server = handleTest ./eris-server.nix { }; eris-server = handleTest ./eris-server.nix { };

14
nixos/tests/envoy.nix
View file

@ -1,15 +1,14 @@
import ./make-test-python.nix ( { envoyPackage, lib, ... }:
{ pkgs, lib, ... }:
{ {
name = "envoy"; name = envoyPackage.pname;
meta = with pkgs.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ cameronnemo ]; maintainers = [ cameronnemo ];
}; };
nodes.machine = nodes.machine = {
{ pkgs, ... }:
{
services.envoy.enable = true; services.envoy.enable = true;
services.envoy.package = envoyPackage;
services.envoy.settings = { services.envoy.settings = {
admin = { admin = {
access_log_path = "/dev/null"; access_log_path = "/dev/null";
@ -59,4 +58,3 @@ import ./make-test-python.nix (
machine.succeed('test -f /var/log/envoy/access.log') machine.succeed('test -f /var/log/envoy/access.log')
''; '';
} }
)