diff options
| author | Scott Worley <scottworley@scottworley.com> | 2020-09-16 08:32:56 -0700 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-25 11:01:30 +0100 |
| commit | 1332215d5974bc27810d8d9cc5bc030c31788eab (patch) | |
| tree | fa8cfc2a02ec3fdec2be6b66a86f2c3160c14a0e /nixos/tests/php | |
| parent | 8bf2635afcefd3198f19fb15fafdea86c66b2a4c (diff) | |
| download | nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.tar nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.tar.gz nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.tar.bz2 nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.tar.lz nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.tar.xz nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.tar.zst nixpkgs-1332215d5974bc27810d8d9cc5bc030c31788eab.zip | |
nixos/tests/php: Use curl --fail
Diffstat (limited to 'nixos/tests/php')
| -rw-r--r-- | nixos/tests/php/fpm.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/php/httpd.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/php/pcre.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 513abd94373..9ad515ebdde 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -43,7 +43,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { machine.wait_for_unit("phpfpm-foobar.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index 1092e0ecadd..27ea7a24e3a 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -21,7 +21,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { machine.wait_for_unit("httpd.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 3dd0964e60f..3ea19304bff 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -32,7 +32,7 @@ in import ../make-test-python.nix ({lib, ...}: { '' machine.wait_for_unit("httpd.service") # Ensure php evaluation by matching on the var_dump syntax - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/index.php") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/index.php") expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"' assert expected in response, "Does not appear to be able to use subgroups." ''; |