forked from mirrors/nixpkgs
nixos/tests/printing: split into service/socket
This splits the tests into two: one where cups.socket is started normally, the order with socket activation. Why? It's almost impossible to follow the test with 4 different machines printing at the same time. It should also be more efficient because only two VMs at a time were needed anyway.
This commit is contained in:
parent
28034190de
commit
4f67365482
|
@ -146,7 +146,8 @@ in rec {
|
|||
(onFullSupported "nixos.tests.predictable-interface-names.predictable")
|
||||
(onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")
|
||||
(onFullSupported "nixos.tests.predictable-interface-names.unpredictable")
|
||||
(onFullSupported "nixos.tests.printing")
|
||||
(onFullSupported "nixos.tests.printing-service")
|
||||
(onFullSupported "nixos.tests.printing-socket")
|
||||
(onFullSupported "nixos.tests.proxy")
|
||||
(onFullSupported "nixos.tests.sddm.default")
|
||||
(onFullSupported "nixos.tests.shadow")
|
||||
|
|
|
@ -525,7 +525,8 @@ in {
|
|||
power-profiles-daemon = handleTest ./power-profiles-daemon.nix {};
|
||||
pppd = handleTest ./pppd.nix {};
|
||||
predictable-interface-names = handleTest ./predictable-interface-names.nix {};
|
||||
printing = handleTest ./printing.nix {};
|
||||
printing-socket = handleTest ./printing.nix { socket = true; };
|
||||
printing-service = handleTest ./printing.nix { socket = false; };
|
||||
privacyidea = handleTest ./privacyidea.nix {};
|
||||
privoxy = handleTest ./privoxy.nix {};
|
||||
prometheus = handleTest ./prometheus.nix {};
|
||||
|
|
|
@ -1,19 +1,31 @@
|
|||
# Test printing via CUPS.
|
||||
|
||||
import ./make-test-python.nix ({pkgs, ... }:
|
||||
let
|
||||
printingServer = startWhenNeeded: {
|
||||
services.printing.enable = true;
|
||||
services.printing.stateless = true;
|
||||
services.printing.startWhenNeeded = startWhenNeeded;
|
||||
services.printing.listenAddresses = [ "*:631" ];
|
||||
services.printing.defaultShared = true;
|
||||
services.printing.extraConf = ''
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs
|
||||
, socket ? true # whether to use socket activation
|
||||
, ...
|
||||
}:
|
||||
|
||||
{
|
||||
name = "printing";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ domenkozar eelco matthewbauer ];
|
||||
};
|
||||
|
||||
nodes.server = { ... }: {
|
||||
services.printing = {
|
||||
enable = true;
|
||||
stateless = true;
|
||||
startWhenNeeded = socket;
|
||||
listenAddresses = [ "*:631" ];
|
||||
defaultShared = true;
|
||||
extraConf = ''
|
||||
<Location />
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Location>
|
||||
'';
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [ 631 ];
|
||||
# Add a HP Deskjet printer connected via USB to the server.
|
||||
hardware.printers.ensurePrinters = [{
|
||||
|
@ -22,32 +34,19 @@ let
|
|||
model = "drv:///sample.drv/deskjet.ppd";
|
||||
}];
|
||||
};
|
||||
printingClient = startWhenNeeded: {
|
||||
|
||||
nodes.client = { ... }: {
|
||||
services.printing.enable = true;
|
||||
services.printing.startWhenNeeded = startWhenNeeded;
|
||||
services.printing.startWhenNeeded = socket;
|
||||
# Add printer to the client as well, via IPP.
|
||||
hardware.printers.ensurePrinters = [{
|
||||
name = "DeskjetRemote";
|
||||
deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal";
|
||||
deviceUri = "ipp://server/printers/DeskjetLocal";
|
||||
model = "drv:///sample.drv/deskjet.ppd";
|
||||
}];
|
||||
hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
|
||||
};
|
||||
|
||||
in {
|
||||
name = "printing";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ domenkozar eelco matthewbauer ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
socketActivatedServer = { ... }: (printingServer true);
|
||||
serviceServer = { ... }: (printingServer false);
|
||||
|
||||
socketActivatedClient = { ... }: (printingClient true);
|
||||
serviceClient = { ... }: (printingClient false);
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import os
|
||||
import re
|
||||
|
@ -55,16 +54,14 @@ in {
|
|||
start_all()
|
||||
|
||||
with subtest("Make sure that cups is up on both sides and printers are set up"):
|
||||
serviceServer.wait_for_unit("cups.service")
|
||||
serviceClient.wait_for_unit("cups.service")
|
||||
socketActivatedClient.wait_for_unit("ensure-printers.service")
|
||||
server.wait_for_unit("cups.${if socket then "socket" else "service"}")
|
||||
client.wait_for_unit("cups.${if socket then "socket" else "service"}")
|
||||
|
||||
|
||||
def test_printing(client, server):
|
||||
assert "scheduler is running" in client.succeed("lpstat -r")
|
||||
|
||||
with subtest("UNIX socket is used for connections"):
|
||||
assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
|
||||
|
||||
with subtest("HTTP server is available too"):
|
||||
client.succeed("curl --fail http://localhost:631/")
|
||||
client.succeed(f"curl --fail http://{server.name}:631/")
|
||||
|
@ -121,9 +118,5 @@ in {
|
|||
# The queue is empty already, so this should be safe.
|
||||
# Otherwise, pairs of "c*"-"d*-001" files might persist.
|
||||
server.execute("rm /var/spool/cups/*")
|
||||
|
||||
|
||||
test_printing(serviceClient, serviceServer)
|
||||
test_printing(socketActivatedClient, socketActivatedServer)
|
||||
'';
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue