Test the ability to change status page path

Author: renatomefi

php-fpm-healthcheck

@@ -52,7 +52,7 @@ command -v grep 1> /dev/null || { >&2 echo "Make sure grep is installed (i.e. ap
 # Get status from fastcgi connection
 # $1 - cgi-fcgi connect argument
 get_fpm_status() {
-    if test "$VERBOSE" = 1; then printf "Trying to connect to php-fpm via: %s\\n" "$1"; fi;
+    if test "$VERBOSE" = 1; then printf "Trying to connect to php-fpm via: %s%s\\n" "$1" "$SCRIPT_NAME"; fi;
 
     # Since I cannot use pipefail I'll just split these in two commands
     FPM_STATUS=$(env -i REQUEST_METHOD="$REQUEST_METHOD" SCRIPT_NAME="$SCRIPT_NAME" SCRIPT_FILENAME="$SCRIPT_FILENAME" "$FCGI_CMD_PATH" -bind -connect "$1" 2> /dev/null)

test/testinfra/test_execution.py

@@ -22,7 +22,9 @@ def test_valid_with_non_integer_value_exits_properly(host):
 
 @pytest.mark.php_fpm
 def test_all_available_options_at_once(host):
-    cmd = host.run("php-fpm-healthcheck --accepted-conn=1000 --listen-queue=1000 --max-listen-queue=1000 --listen-queue-len=1000 --idle-processes=1000 --active-processes=1000 --total-processes=1000 --max-active-processes=1000 --max-children-reached=1000 --slow-requests=1000")
+    cmd = host.run("php-fpm-healthcheck --accepted-conn=1000 --listen-queue=1000 --max-listen-queue=1000 "
+                   "--listen-queue-len=1000 --idle-processes=1000 --active-processes=1000 --total-processes=1000 "
+                   "--max-active-processes=1000 --max-children-reached=1000 --slow-requests=1000")
     assert cmd.rc == 0    
 
 @pytest.mark.php_fpm

test/testinfra/test_fpm.py

@@ -47,6 +47,20 @@ def test_fpm_on_socket_with_huge_env(host, setup_fpm_to_default_fixture):
     assert "status output:" in cmd.stdout
     assert "pool:" in cmd.stdout
 
+@pytest.mark.php_fpm
+def test_default_status_page_path(host, setup_fpm_to_default_fixture):
+    cmd = host.run("php-fpm-healthcheck -v")
+    assert cmd.rc == 0
+    assert "Trying to connect to php-fpm via: localhost:9000/status" in cmd.stdout
+
+@pytest.mark.php_fpm
+def test_exit_when_fpm_is_invalid_path(host, setup_fpm_to_default_fixture):
+    cmd = host.run("FCGI_STATUS_PATH=/invalid php-fpm-healthcheck -v")
+    assert cmd.rc == 8
+    assert "Trying to connect to php-fpm via: localhost:9000/invalid" in cmd.stdout
+    assert "File not found." in cmd.stdout
+    assert "php-fpm status page non reachable" in cmd.stderr
+
 @pytest.mark.alpine
 def test_exit_when_fpm_is_not_reachable_apk(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_CONNECT=localhost:9001 php-fpm-healthcheck -v")
@@ -70,3 +84,4 @@ def test_exit_when_fpm_is_invalid_host_apt(host, setup_fpm_to_default_fixture):
     cmd = host.run("FCGI_CONNECT=abc php-fpm-healthcheck -v")
     assert cmd.rc == 2
     assert "Trying to connect to php-fpm via: abc" in cmd.stdout
+