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

Revert "nixos.tests.printing: fix"

Browse Source 
This reverts commit 49894ac857fd1206ac111d6adbf6e9f6e640d795.

Reverting in deference to https://github.com/NixOS/nixpkgs/issues/14782
This commit is contained in:
Joachim Fasting 2016-04-18 13:40:35 +02:00
parent 454a64caff
commit 55a82158e2
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->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;