diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
| commit | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (patch) | |
| tree | 3546e83902366b34599e8d5f6a698e37935a104d /nixos/tests/printing.nix | |
| parent | ed3cb39bfa7234e5bbf2b50ce6f658ef5fda686a (diff) | |
| parent | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff) | |
| download | nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.gz nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.bz2 nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.lz nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.xz nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.zst nixlib-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/tests/printing.nix')
| -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; |