diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:30:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:30:16 +0200 |
| commit | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (patch) | |
| tree | 11455dc939663bdda36790451315de1cc364614b /nixos/tests | |
| parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) | |
| parent | a2bd8da766c7a7ea456afd099b86920dd902cec4 (diff) | |
| download | nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.gz nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.bz2 nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.lz nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.xz nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.zst nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/printing.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e8702c1ffbf1..74583ae55623 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({pkgs, ... }: { name = "printing"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco ]; + maintainers = [ domenkozar eelco matthewbauer ]; }; nodes = { @@ -34,10 +34,6 @@ import ./make-test.nix ({pkgs, ... }: { '' startAll; - # Make sure that cups is up on both sides. - $server->waitForUnit("cups.service"); - $client->waitForUnit("cups.service"); - $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; # check local encrypted connections work without error $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; |