public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos.tests.printing: fix

Browse Source 
Two fixes:

Not really sure why removing `--fail` from the curl calls is necessary,
but with that option, curl erronously reports 404 (which it shouldn't
per my interactive vm testing).

Fix paths to example files used for the printing test

Toghether, these changes allow the test to run to completion on my machine.
This commit is contained in:
Joachim Fasting 2016-04-18 01:16:19 +02:00
parent 192a1ada24
commit 49894ac857
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/tests/printing.nix
View File

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