summary refs log tree commit diff
path: root/nixos/tests/xandikos.nix
diff options
context:
space:
mode:
authortalyz <kim.lindberger@gmail.com>2021-06-05 15:50:58 +0200
committertalyz <kim.lindberger@gmail.com>2021-06-05 18:44:54 +0200
commit3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff (patch)
tree69f57ede899503635b6b17fea23e6f0a976c9991 /nixos/tests/xandikos.nix
parenta86853501a339f95765a6763e9c409f374606faa (diff)
downloadnixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.tar
nixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.tar.gz
nixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.tar.bz2
nixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.tar.lz
nixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.tar.xz
nixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.tar.zst
nixpkgs-3d9c3e5cfd8705b03a175ef40f6eeaa9a16634ff.zip
nixosTests.*: Don't use the `-q` flag with grep when used with curl
The `-q` flag makes grep close the pipe early, which curl doesn't
handle gracefully, but exits with an error like "(23) Failed writing
body".
Diffstat (limited to 'nixos/tests/xandikos.nix')
-rw-r--r--nixos/tests/xandikos.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/xandikos.nix b/nixos/tests/xandikos.nix
index 48c770a3d16..69d78ee21e7 100644
--- a/nixos/tests/xandikos.nix
+++ b/nixos/tests/xandikos.nix
@@ -44,7 +44,7 @@ import ./make-test-python.nix (
             xandikos_default.wait_for_open_port(8080)
             xandikos_default.succeed("curl --fail http://localhost:8080/")
             xandikos_default.succeed(
-                "curl -s --fail --location http://localhost:8080/ | grep -qi Xandikos"
+                "curl -s --fail --location http://localhost:8080/ | grep -i Xandikos"
             )
             xandikos_client.wait_for_unit("network.target")
             xandikos_client.fail("curl --fail http://xandikos_default:8080/")
@@ -55,15 +55,15 @@ import ./make-test-python.nix (
             xandikos_proxy.wait_for_open_port(8080)
             xandikos_proxy.succeed("curl --fail http://localhost:8080/")
             xandikos_proxy.succeed(
-                "curl -s --fail --location http://localhost:8080/ | grep -qi Xandikos"
+                "curl -s --fail --location http://localhost:8080/ | grep -i Xandikos"
             )
             xandikos_client.wait_for_unit("network.target")
             xandikos_client.fail("curl --fail http://xandikos_proxy:8080/")
             xandikos_client.succeed(
-                "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/ | grep -qi Xandikos"
+                "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/ | grep -i Xandikos"
             )
             xandikos_client.succeed(
-                "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/user/ | grep -qi Xandikos"
+                "curl -s --fail -u xandikos:snakeOilPassword -H 'Host: xandikos.local' http://xandikos_proxy/xandikos/user/ | grep -i Xandikos"
             )
       '';
     }