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

nixosTests.printing-{socket,service,socket-notcp,service-notcp}: migrate to runTest

Browse source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-16 14:55:07 +02:00
parent 8d74a87fa1
commit 46ddd0d906
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 135 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,21 +1091,25 @@ in
pretalx = runTest ./web-apps/pretalx.nix; pretalx = runTest ./web-apps/pretalx.nix;
prefect = runTest ./prefect.nix; prefect = runTest ./prefect.nix;
pretix = runTest ./web-apps/pretix.nix; pretix = runTest ./web-apps/pretix.nix;
printing-socket = handleTest ./printing.nix { printing-socket = runTest {
socket = true; imports = [ ./printing.nix ];
listenTcp = true; _module.args.socket = true;
_module.args.listenTcp = true;
}; };
printing-service = handleTest ./printing.nix { printing-service = runTest {
socket = false; imports = [ ./printing.nix ];
listenTcp = true; _module.args.socket = false;
_module.args.listenTcp = true;
}; };
printing-socket-notcp = handleTest ./printing.nix { printing-socket-notcp = runTest {
socket = true; imports = [ ./printing.nix ];
listenTcp = false; _module.args.socket = true;
_module.args.listenTcp = false;
}; };
printing-service-notcp = handleTest ./printing.nix { printing-service-notcp = runTest {
socket = false; imports = [ ./printing.nix ];
listenTcp = false; _module.args.socket = false;
_module.args.listenTcp = false;
}; };
private-gpt = handleTest ./private-gpt.nix { }; private-gpt = handleTest ./private-gpt.nix { };
privatebin = runTest ./privatebin.nix; privatebin = runTest ./privatebin.nix;

15
nixos/tests/printing.nix
View file

@ -1,18 +1,16 @@
# Test printing via CUPS. # Test printing via CUPS.
{
import ./make-test-python.nix (
{
pkgs, pkgs,
socket ? true, # whether to use socket activation socket ? true, # whether to use socket activation
listenTcp ? true, # whether to open port 631 on client listenTcp ? true, # whether to open port 631 on client
... ...
}: }:
let let
inherit (pkgs) lib; inherit (pkgs) lib;
in in
{ {
name = "printing"; name = "printing";
meta = with lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ maintainers = [
@ -137,5 +135,4 @@ import ./make-test-python.nix (
# Otherwise, pairs of "c*"-"d*-001" files might persist. # Otherwise, pairs of "c*"-"d*-001" files might persist.
server.execute("rm /var/spool/cups/*") server.execute("rm /var/spool/cups/*")
''; '';
} }
)