Update tests for apache conatiner

Author: J0WI

.travis.yml

@@ -12,7 +12,7 @@ python:
 env:
   matrix:
     - DB=mysql:latest
-    - DB=mariadb:10.2
+    - DB=mariadb:latest
 
 before_install:
   - export TESTSUITE_PASSWORD=`openssl rand -base64 30`
@@ -42,4 +42,5 @@ script:
   - docker-compose stop
   # Run tests in testing container
   - docker-compose -f docker-compose.testing.yml up -d phpmyadmin
+  - docker-compose exec phpmyadmin /test-docker.sh test 80 db_server
   - ./testing/wait-for-testing.sh

docker-compose.testing.yml

@@ -3,22 +3,24 @@ version: '2'
 services:
   db_server:
     image: ${DB}
-    container_name: phpmyadmin_testing_mariadb
+    container_name: phpmyadmin_testing_${DB}
     environment:
-      - MYSQL_ROOT_PASSWORD=test123
+      - MYSQL_ROOT_PASSWORD=${TESTSUITE_PASSWORD}
     volumes:
       - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
 
   phpmyadmin:
     build:
       context: testing/
+    links:
+      - db_server:db_server
     container_name: phpmyadmin_testing
     volumes:
       - /sessions
     ports:
       - 8090:80
     environment:
       - PMA_ARBITRARY=1
-      - TESTSUITE_PASSWORD=test123
+      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD}
     depends_on:
       - db_server

testing/Dockerfile

@@ -3,8 +3,14 @@
 FROM phpmyadmin/phpmyadmin
 
 # Install test dependencies
-RUN apk add --no-cache curl py2-pip
-RUN pip install mechanize html5lib
+RUN set -ex; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		curl \
+		python-pip \
+	; \
+	pip install mechanize html5lib; \
+	rm -rf /var/lib/apt/lists/*
 
-COPY test.ini /etc/supervisor.d/
 COPY phpmyadmin_test.py test-docker.sh world.sql /

testing/phpmyadmin_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 import argparse
 import os
 import re

testing/test-docker.sh

@@ -36,7 +36,7 @@ if [ -f /.dockerenv ] ; then
 
     # Wait for database to start
     TIMEOUT=0
-    while ! curl "$PHPMYADMIN_DB_URL" &>/dev/null; do
+    while [ $(docker logs db_server 2>&1 | fgrep -c "mysqld: ready for connections.") -le 0 ] ; do
         echo "Waiting for ${PHPMYADMIN_DB_HOSTNAME} database start..."
         sleep 10
         TIMEOUT=$((TIMEOUT + 1))
@@ -55,7 +55,7 @@ fi
 
 # Wait for container to start
 TIMEOUT=0
-while ! $COMMAND_HOST ps aux | grep -q nginx ; do
+while [ $(docker logs ${NAME} 2>&1 | fgrep -c "Command line: 'apache2 -D FOREGROUND'") -le 0 ] ; do
     echo "Waiting for PHPMyAdmin start..."
     sleep 1
     TIMEOUT=$((TIMEOUT + 1))
@@ -76,17 +76,15 @@ if [ $ret -eq 0 ] ; then
     else
         FILENAME=./testing/phpmyadmin_test.py
     fi
-    python $FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
+    python2 $FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
     ret=$?
 fi
 
 # Show debug output in case of failure
 if [ $ret -ne 0 ] ; then
     curl "$PHPMYADMIN_URL"
     $COMMAND_HOST ps faux
-    $COMMAND_HOST cat /var/log/php-fpm.log
-    $COMMAND_HOST cat /var/log/nginx-error.log
-    $COMMAND_HOST cat /var/log/supervisord.log
+    docker logs ${NAME}
     echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}"
     exit $ret
 fi