diff options
| -rw-r--r-- | nixos/tests/printing.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index adbef228c2f..10d69b446cd 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -40,9 +40,9 @@ import ./make-test.nix ({pkgs, ... }: { $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; - $client->succeed("curl http://localhost:631/"); - $client->succeed("curl http://server:631/"); - $server->fail("curl --connect-timeout 2 http://client:631/"); + $client->succeed("curl --fail http://localhost:631/"); + $client->succeed("curl --fail http://server:631/"); + $server->fail("curl --fail --connect-timeout 2 http://client:631/"); # Add a HP Deskjet printer connected via USB to the server. $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar"); @@ -60,10 +60,10 @@ import ./make-test.nix ({pkgs, ... }: { $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die; # Test printing various file types. - foreach my $file ("${pkgs.groff.doc}/share/doc/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/meref.ps", + foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", "${pkgs.cups}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre.txt") + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt") { $file =~ /([^\/]*)$/; my $fn = $1; |