Fix and improve test suite

Makefile

@@ -18,6 +18,9 @@ build-fpm-alpine:
 run:
 	docker-compose -f docker-compose.testing.yml up -d
 
+run-tests:
+	docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
+
 logs:
 	docker-compose -f docker-compose.testing.yml logs
 

docker-compose.testing.yml

@@ -1,26 +1,30 @@
-version: '2'
+version: '3.1'
 
 services:
   db_server:
-    image: ${DB}
+    image: ${DB:-mariadb:10.3}
     container_name: phpmyadmin_testing_db
     environment:
-      - MYSQL_ROOT_PASSWORD=${TESTSUITE_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${TESTSUITE_PASSWORD:-my-secret-pw}
     volumes:
       - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
+    tmpfs: 
+      - /var/lib/mysql:rw,noexec,nosuid,size=300m
 
   phpmyadmin:
     build:
       context: testing/
-    links:
-      - db_server:db_server
     container_name: phpmyadmin_testing
     volumes:
       - /sessions
+      - ./testing/conftest.py:/conftest.py
+      - ./testing/test-docker.sh:/test-docker.sh
+      - ./testing/phpmyadmin_test.py:/phpmyadmin_test.py
+      - ./docker-entrypoint.sh:/docker-entrypoint.sh
     ports:
       - 8090:80
     environment:
       - PMA_ARBITRARY=1
-      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD}
+      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD:-my-secret-pw}
     depends_on:
       - db_server

testing/Dockerfile

@@ -10,7 +10,8 @@ RUN set -ex; \
 		curl \
 		python-pip \
 	; \
-	pip install mechanize html5lib; \
+	pip install setuptools wheel; \
+	pip install mechanize html5lib pytest; \
 	rm -rf /var/lib/apt/lists/*
 
-COPY phpmyadmin_test.py test-docker.sh world.sql /
+COPY phpmyadmin_test.py test-docker.sh world.sql conftest.py /

testing/conftest.py

@@ -0,0 +1,28 @@
+import pytest
+
+def pytest_addoption(parser):
+    parser.addoption("--url")
+    parser.addoption("--username")
+    parser.addoption("--password")
+    parser.addoption("--server")
+    parser.addoption("--sqlfile")
+
+@pytest.fixture
+def url(request):
+    return request.config.getoption("--url")
+
+@pytest.fixture
+def username(request):
+    return request.config.getoption("--username")
+
+@pytest.fixture
+def password(request):
+    return request.config.getoption("--password")
+
+@pytest.fixture
+def server(request):
+    return request.config.getoption("--server")
+
+@pytest.fixture
+def sqlfile(request):
+    return request.config.getoption("--sqlfile")

testing/phpmyadmin_test.py

@@ -1,26 +1,27 @@
 #!/usr/bin/env python2
 import argparse
 import os
+import subprocess
 import re
 import sys
 
 import mechanize
+import tempfile
+import pytest
 
 
-def test_content(match, content):
-    if not match in content:
-        print(content)
-        raise Exception('{0} not found in content!'.format(match))
+def do_test_content(match, content):
+    assert(match in content)
 
-
-def test_phpmyadmin(url, username, password, server=None, sqlfile=None):
+def test_phpmyadmin(url, username, password, server, sqlfile):
     if sqlfile is None:
         if os.path.exists('/world.sql'):
             sqlfile = '/world.sql'
         elif os.path.exists('./world.sql'):
             sqlfile = './world.sql'
         else:
-            sqlfile = './testing/world.sql'
+            path = os.path.dirname(os.path.realpath(__file__))
+            sqlfile = path + '/world.sql'
     br = mechanize.Browser()
 
     # Ignore robots.txt
@@ -38,36 +39,37 @@ def test_phpmyadmin(url, username, password, server=None, sqlfile=None):
 
     # Login and check if loggged in
     response = br.submit()
-    test_content('Server version', response.read())
+    do_test_content('Server version', response.read())
 
     # Open server import
     response = br.follow_link(text_regex=re.compile('Import'))
-    test_content('OpenDocument Spreadsheet', response.read())
+    do_test_content('OpenDocument Spreadsheet', response.read())
 
     # Upload SQL file
     br.select_form('import')
     br.form.add_file(open(sqlfile), 'text/plain', sqlfile)
     response = br.submit()
-    test_content('5326 queries executed', response.read())
+    do_test_content('5326 queries executed', response.read())
+
+
+def docker_secret(env_name):
+    dir_path = os.path.dirname(os.path.realpath(__file__))
+    secret_file = tempfile.mkstemp()
 
+    password = "The_super_secret_password"
+    password_file = open(secret_file[1], 'wb')
+    password_file.write(str.encode(password))
+    password_file.close()
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--url', required=True)
-    parser.add_argument('--username', required=True)
-    parser.add_argument('--password', required=True)
-    parser.add_argument('--server')
-    parser.add_argument('--sqlfile', default=None)
-    args = parser.parse_args()
+    test_env = {env_name + '_FILE': secret_file[1]}
 
-    test_phpmyadmin(
-        args.url,
-        args.username,
-        args.password,
-        args.server,
-        args.sqlfile
-    )
+    # Run entrypoint and afterwards echo the environment variables
+    result = subprocess.Popen(dir_path+ "/../docker-entrypoint.sh 'env'", shell=True, stdout=subprocess.PIPE, env=test_env)
+    output = result.stdout.read().decode()
 
+    assert (env_name + "=" + password) in output
 
-if __name__ == '__main__':
-    main()
+def test_phpmyadmin_secrets():
+    docker_secret('MYSQL_PASSWORD')
+    docker_secret('MYSQL_ROOT_PASSWORD')
+    docker_secret('PMA_PASSWORD')

testing/test-docker.sh

@@ -28,6 +28,7 @@ GREEN="\033[0;32m"
 RED="\033[0;31m"
 NC="\033[0m" # No Color
 
+
 # Find test script
 if [ -f ./phpmyadmin_test.py ] ; then
     FILENAME=./phpmyadmin_test.py
@@ -75,12 +76,11 @@ fi
 
 # Perform tests
 ret=0
-$FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
+pytest -q --url "$PHPMYADMIN_URL" --username root --password "$TESTSUITE_PASSWORD"  $SERVER $FILENAME
 ret=$?
 
 # Show debug output in case of failure
 if [ $ret -ne 0 ] ; then
-    curl "$PHPMYADMIN_URL"
     ${COMMAND_HOST} ps faux
     echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}"
     exit $ret