Set default_authentication_plugin and use only one container in tests

Author: J0WI

.travis.yml

@@ -16,7 +16,7 @@ env:
 
 before_install:
   - export TESTSUITE_PASSWORD=`openssl rand -base64 30`
-  - docker run --name db_server -e MYSQL_ROOT_PASSWORD=$TESTSUITE_PASSWORD -d $DB
+  - docker run --name db_server -e MYSQL_ROOT_PASSWORD=$TESTSUITE_PASSWORD -v $PWD/testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro -d $DB
 
 install:
   - pip install mechanize html5lib

docker-compose.testing.yml

@@ -1,17 +1,13 @@
 version: '2'
 
 services:
-  mariadb:
-    image: mariadb:latest
+  db_server:
+    image: ${DB}
     container_name: phpmyadmin_testing_mariadb
     environment:
       - MYSQL_ROOT_PASSWORD=test123
-
-  mysql:
-    image: mysql:latest
-    container_name: phpmyadmin_testing_mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=test123
+    volumes:
+      - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
 
   phpmyadmin:
     build:
@@ -25,5 +21,4 @@ services:
       - PMA_ARBITRARY=1
       - TESTSUITE_PASSWORD=test123
     depends_on:
-      - mariadb
-      - mysql
+      - db_server

testing/Dockerfile

@@ -6,5 +6,5 @@ FROM phpmyadmin/phpmyadmin
 RUN apk add --no-cache curl py2-pip
 RUN pip install mechanize html5lib
 
-COPY test-mariadb.ini test-mysql.ini /etc/supervisor.d/
+COPY test.ini /etc/supervisor.d/
 COPY phpmyadmin_test.py test-docker.sh world.sql /

testing/test-mysql.ini renamed to testing/test.ini

@@ -1,5 +1,5 @@
 [program:test-mysql]
-command=/test-docker.sh test 80 mysql
+command=/test-docker.sh test 80 db_server
 autostart=true
 autorestart=false
 priority=3

testing/testing.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+default_authentication_plugin = mysql_native_password

testing/wait-for-testing.sh

@@ -11,7 +11,7 @@ TIMEOUT=0
 
 sleep 5
 
-while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of \(mysql\|mariadb\) tests'` -lt 2 ] ; do
+while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of db_server tests'` -lt 1 ] ; do
     sleep 1
     TIMEOUT=$(($TIMEOUT + 1))
     if [ $TIMEOUT -gt 20 ] ; then
@@ -21,7 +21,7 @@ while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c
     fi
 done
 
-if [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of \(mysql\|mariadb\) tests.*SUCCESS'` -lt 2 ] ; then
+if [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of db_server tests.*SUCCESS'` -lt 1 ] ; then
     docker-compose -f docker-compose.testing.yml logs phpmyadmin
     echo "${RED}Failed${NC}"
     exit 2