gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-11 11:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #30 Adjust tests for PHP 5.2

Browse Source
This commit is contained in:
cytopia
2018-08-02 21:55:44 +02:00
parent cb176f5eba
commit bd336c9e09
3 changed files with 127 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/base/04-test-run_nginx.sh
View File

@@ -71,6 +71,12 @@ run "sleep 10"
### ###
### Check correct PHP-FPM user ### Check correct PHP-FPM user
### ###
# On pm = ondemand, there will be no child process, so we need to create some traffic
# in order to have child proccesses spawn
for i in $(seq 1 10); do
curl http://127.0.0.1:${WWW_PORT}/index.php?${i} >/dev/null 2>&1 &
done
if ! docker_exec "${did}" "ps auxw | grep -E '(php-fpm: pool|php-cgi)' | grep -v grep | awk '{ print \$1 }' | tail -1 | grep devilbox"; then if ! docker_exec "${did}" "ps auxw | grep -E '(php-fpm: pool|php-cgi)' | grep -v grep | awk '{ print \$1 }' | tail -1 | grep devilbox"; then
docker_exec "${did}" "ps auxw" docker_exec "${did}" "ps auxw"

69
tests/prod/02-test-env-docker_logs-stdout.sh
View File

@@ -122,38 +122,43 @@ if [ -f "${LOG_DIR_HOST}/php-fpm.error" ]; then
exit 1 exit 1
fi fi
if ! run "docker logs ${did} 2>&1 | grep -q 'GET /ok.php'"; then ###
echo "Error no access log string for 'GET /ok.php' found in stderr" ### PHP 5.2 still does not show any errors
docker_logs "${did}" || true ###
docker_stop "${ndid}" || true if [ "${VERSION}" != "5.2" ]; then
docker_stop "${did}" || true if ! run "docker logs ${did} 2>&1 | grep -q 'GET /ok.php'"; then
rm -rf "${LOG_DIR_HOST}" echo "Error no access log string for 'GET /ok.php' found in stderr"
rm -rf "${CFG_DIR_HOST}" docker_logs "${did}" || true
rm -rf "${WWW_DIR_HOST}" docker_stop "${ndid}" || true
echo "Failed" docker_stop "${did}" || true
exit 1 rm -rf "${LOG_DIR_HOST}"
fi rm -rf "${CFG_DIR_HOST}"
if ! run "docker logs ${did} 2>&1 | grep -q 'GET /fail.php'"; then rm -rf "${WWW_DIR_HOST}"
echo "Error no access log string for 'GET /fail.php' found in stderr" echo "Failed"
docker_logs "${did}" || true exit 1
docker_stop "${ndid}" || true fi
docker_stop "${did}" || true if ! run "docker logs ${did} 2>&1 | grep -q 'GET /fail.php'"; then
rm -rf "${LOG_DIR_HOST}" echo "Error no access log string for 'GET /fail.php' found in stderr"
rm -rf "${CFG_DIR_HOST}" docker_logs "${did}" || true
rm -rf "${WWW_DIR_HOST}" docker_stop "${ndid}" || true
echo "Failed" docker_stop "${did}" || true
exit 1 rm -rf "${LOG_DIR_HOST}"
fi rm -rf "${CFG_DIR_HOST}"
if ! run "docker logs ${did} 2>&1 | grep -q '/var/www/default/fail.php'"; then rm -rf "${WWW_DIR_HOST}"
echo "Error no error message found in stderr" echo "Failed"
docker_logs "${did}" || true exit 1
docker_stop "${ndid}" || true fi
docker_stop "${did}" || true if ! run "docker logs ${did} 2>&1 | grep -q '/var/www/default/fail.php'"; then
rm -rf "${LOG_DIR_HOST}" echo "Error no error message found in stderr"
rm -rf "${CFG_DIR_HOST}" docker_logs "${did}" || true
rm -rf "${WWW_DIR_HOST}" docker_stop "${ndid}" || true
echo "Failed" docker_stop "${did}" || true
exit 1 rm -rf "${LOG_DIR_HOST}"
rm -rf "${CFG_DIR_HOST}"
rm -rf "${WWW_DIR_HOST}"
echo "Failed"
exit 1
fi
fi fi

166
tests/prod/03-test-env-docker_logs-file.sh
View File

@@ -144,89 +144,91 @@ if [ ! -r "${LOG_DIR_HOST}/php-fpm.error" ]; then
exit 1 exit 1
fi fi
# Ensure no access/error goes to stderr ###
if run "docker logs ${did} 2>&1 | grep -q 'GET /ok.php'"; then ### PHP 5.2 still does not show any errors
echo "Error access log string for 'GET /ok.php' found in stderr, but shold go to file" ###
run "cat ${LOG_DIR_HOST}/php-fpm.access" if [ "${VERSION}" != "5.2" ]; then
run "cat ${LOG_DIR_HOST}/php-fpm.error" # Ensure no access/error goes to stderr
docker_logs "${did}" || true if run "docker logs ${did} 2>&1 | grep -q 'GET /ok.php'"; then
docker_stop "${ndid}" || true echo "Error access log string for 'GET /ok.php' found in stderr, but shold go to file"
docker_stop "${did}" || true run "cat ${LOG_DIR_HOST}/php-fpm.access"
rm -rf "${LOG_DIR_HOST}" run "cat ${LOG_DIR_HOST}/php-fpm.error"
rm -rf "${CFG_DIR_HOST}" docker_logs "${did}" || true
rm -rf "${WWW_DIR_HOST}" docker_stop "${ndid}" || true
echo "Failed" docker_stop "${did}" || true
exit 1 rm -rf "${LOG_DIR_HOST}"
fi rm -rf "${CFG_DIR_HOST}"
if run "docker logs ${did} 2>&1 | grep -q 'GET /fail.php'"; then rm -rf "${WWW_DIR_HOST}"
echo "Error access log string for 'GET /fail.php' found in stderr, but should go to file" echo "Failed"
run "cat ${LOG_DIR_HOST}/php-fpm.access" exit 1
run "cat ${LOG_DIR_HOST}/php-fpm.error" fi
docker_logs "${did}" || true if run "docker logs ${did} 2>&1 | grep -q 'GET /fail.php'"; then
docker_stop "${ndid}" || true echo "Error access log string for 'GET /fail.php' found in stderr, but should go to file"
docker_stop "${did}" || true run "cat ${LOG_DIR_HOST}/php-fpm.access"
rm -rf "${LOG_DIR_HOST}" run "cat ${LOG_DIR_HOST}/php-fpm.error"
rm -rf "${CFG_DIR_HOST}" docker_logs "${did}" || true
rm -rf "${WWW_DIR_HOST}" docker_stop "${ndid}" || true
echo "Failed" docker_stop "${did}" || true
exit 1 rm -rf "${LOG_DIR_HOST}"
fi rm -rf "${CFG_DIR_HOST}"
if run "docker logs ${did} 2>&1 | grep -q '/var/www/default/fail.php'"; then rm -rf "${WWW_DIR_HOST}"
echo "Error error message found in stderr, but should go to file" echo "Failed"
run "cat ${LOG_DIR_HOST}/php-fpm.access" exit 1
run "cat ${LOG_DIR_HOST}/php-fpm.error" fi
docker_logs "${did}" || true if run "docker logs ${did} 2>&1 | grep -q '/var/www/default/fail.php'"; then
docker_stop "${ndid}" || true echo "Error error message found in stderr, but should go to file"
docker_stop "${did}" || true run "cat ${LOG_DIR_HOST}/php-fpm.access"
rm -rf "${LOG_DIR_HOST}" run "cat ${LOG_DIR_HOST}/php-fpm.error"
rm -rf "${CFG_DIR_HOST}" docker_logs "${did}" || true
rm -rf "${WWW_DIR_HOST}" docker_stop "${ndid}" || true
echo "Failed" docker_stop "${did}" || true
exit 1 rm -rf "${LOG_DIR_HOST}"
fi rm -rf "${CFG_DIR_HOST}"
rm -rf "${WWW_DIR_HOST}"
echo "Failed"
exit 1
fi
# Test access and error file for correct content
if ! run "grep -q 'GET /ok.php' ${LOG_DIR_HOST}/php-fpm.access"; then
echo "Error no access log string for 'GET /ok.php' found in: ${LOG_DIR_HOST}/php-fpm.access"
# Test access and error file for correct content run "cat ${LOG_DIR_HOST}/php-fpm.access"
if ! run "grep -q 'GET /ok.php' ${LOG_DIR_HOST}/php-fpm.access"; then run "cat ${LOG_DIR_HOST}/php-fpm.error"
echo "Error no access log string for 'GET /ok.php' found in: ${LOG_DIR_HOST}/php-fpm.access" docker_logs "${did}" || true
run "cat ${LOG_DIR_HOST}/php-fpm.access" docker_stop "${ndid}" || true
run "cat ${LOG_DIR_HOST}/php-fpm.error" docker_stop "${did}" || true
docker_logs "${did}" || true rm -rf "${LOG_DIR_HOST}"
docker_stop "${ndid}" || true rm -rf "${CFG_DIR_HOST}"
docker_stop "${did}" || true rm -rf "${WWW_DIR_HOST}"
rm -rf "${LOG_DIR_HOST}" echo "Failed"
rm -rf "${CFG_DIR_HOST}" exit 1
rm -rf "${WWW_DIR_HOST}" fi
echo "Failed" if ! run "grep -q 'GET /fail.php' ${LOG_DIR_HOST}/php-fpm.access"; then
exit 1 echo "Error no access log string for 'GET /fail.php' found in: ${LOG_DIR_HOST}/php-fpm.access"
fi run "cat ${LOG_DIR_HOST}/php-fpm.access"
if ! run "grep -q 'GET /fail.php' ${LOG_DIR_HOST}/php-fpm.access"; then run "cat ${LOG_DIR_HOST}/php-fpm.error"
echo "Error no access log string for 'GET /fail.php' found in: ${LOG_DIR_HOST}/php-fpm.access" docker_logs "${did}" || true
run "cat ${LOG_DIR_HOST}/php-fpm.access" docker_stop "${ndid}" || true
run "cat ${LOG_DIR_HOST}/php-fpm.error" docker_stop "${did}" || true
docker_logs "${did}" || true rm -rf "${LOG_DIR_HOST}"
docker_stop "${ndid}" || true rm -rf "${CFG_DIR_HOST}"
docker_stop "${did}" || true rm -rf "${WWW_DIR_HOST}"
rm -rf "${LOG_DIR_HOST}" echo "Failed"
rm -rf "${CFG_DIR_HOST}" exit 1
rm -rf "${WWW_DIR_HOST}" fi
echo "Failed" if ! run "grep -q '/var/www/default/fail.php' ${LOG_DIR_HOST}/php-fpm.error"; then
exit 1 echo "Error no error message found in: ${LOG_DIR_HOST}/php-fpm.error"
fi run "cat ${LOG_DIR_HOST}/php-fpm.access"
if ! run "grep -q '/var/www/default/fail.php' ${LOG_DIR_HOST}/php-fpm.error"; then run "cat ${LOG_DIR_HOST}/php-fpm.error"
echo "Error no error message found in: ${LOG_DIR_HOST}/php-fpm.error" docker_logs "${did}" || true
run "cat ${LOG_DIR_HOST}/php-fpm.access" docker_stop "${ndid}" || true
run "cat ${LOG_DIR_HOST}/php-fpm.error" docker_stop "${did}" || true
docker_logs "${did}" || true rm -rf "${LOG_DIR_HOST}"
docker_stop "${ndid}" || true rm -rf "${CFG_DIR_HOST}"
docker_stop "${did}" || true rm -rf "${WWW_DIR_HOST}"
rm -rf "${LOG_DIR_HOST}" echo "Failed"
rm -rf "${CFG_DIR_HOST}" exit 1
rm -rf "${WWW_DIR_HOST}" fi
echo "Failed"
exit 1
fi fi