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

Fix tests for PHP 5.2

Browse Source
This commit is contained in:
cytopia
2018-08-04 02:04:06 +02:00
parent 04a24b69b6
commit 7902a6a1ab
2 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
tests/prod/07-test-mount-custom_fpm_conf.sh
View File

@@ -18,7 +18,7 @@ FLAVOUR="${3}"
############################################################ ############################################################
# Tests # Tests
############################################################ ############################################################
if [ "${VERSION}" != "5.2" ]; then if [ "${VERSION}" = "5.2" ]; then
echo "Skipping tests for PHP 5.2" echo "Skipping tests for PHP 5.2"
exit 0 exit 0
fi fi