diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-02-23 13:41:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-02-23 18:51:39 +0300 |
| commit | 9c1c424e525b637560d91b99430b83cdaed24820 (patch) | |
| tree | cc0d993cc7ded30df67c33468fbd906869c1c745 /nixos/tests | |
| parent | 998fdfdc94b14f49ea3e8042f2d1e74dd4945bcb (diff) | |
| download | nixlib-9c1c424e525b637560d91b99430b83cdaed24820.tar nixlib-9c1c424e525b637560d91b99430b83cdaed24820.tar.gz nixlib-9c1c424e525b637560d91b99430b83cdaed24820.tar.bz2 nixlib-9c1c424e525b637560d91b99430b83cdaed24820.tar.lz nixlib-9c1c424e525b637560d91b99430b83cdaed24820.tar.xz nixlib-9c1c424e525b637560d91b99430b83cdaed24820.tar.zst nixlib-9c1c424e525b637560d91b99430b83cdaed24820.zip | |
cups service: fix client sockets
Use systemd to create the directory for UNIX socket. Also use localhost instead of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when available.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/printing.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 2d3ecaf94cfa..989008830613 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,7 +39,9 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; - $client->succeed("lpstat -H") =~ "localhost:631" or die; + # Test that UNIX socket is used for connections. + $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + # Test that HTTP server is available too. $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/"); |