pyrox.dev
Revert "nixos.tests.printing: fix"
This reverts commit 49894ac857fd1206ac111d6adbf6e9f6e640d795.
Reverting in deference to https://github.com/NixOS/nixpkgs/issues/14782
+6
-6
nixos/tests/printing.nix
+6
-6
nixos/tests/printing.nix
···
40
40
$client->sleep(10); # wait until cups is fully initialized
41
41
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
42
42
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
43
-
$client->succeed("curl http://localhost:631/");
44
-
$client->succeed("curl http://server:631/");
45
-
$server->fail("curl --connect-timeout 2 http://client:631/");
43
+
$client->succeed("curl --fail http://localhost:631/");
44
+
$client->succeed("curl --fail http://server:631/");
45
+
$server->fail("curl --fail --connect-timeout 2 http://client:631/");
46
46
47
47
# Add a HP Deskjet printer connected via USB to the server.
48
48
$server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar");
···
60
60
$client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
61
61
62
62
# Test printing various file types.
63
-
foreach my $file ("${pkgs.groff.doc}/share/doc/examples/mom/penguin.pdf",
64
-
"${pkgs.groff.doc}/share/doc/meref.ps",
63
+
foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
64
+
"${pkgs.groff.doc}/share/doc/*/meref.ps",
65
65
"${pkgs.cups}/share/doc/cups/images/cups.png",
66
-
"${pkgs.pcre.doc}/share/doc/pcre.txt")
66
+
"${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
67
67
{
68
68
$file =~ /([^\/]*)$/; my $fn = $1;
69
69