Move all testing files into subdirectory

This makes the file structure a bit cleaner.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař
2017-03-28 11:24:10 +02:00
parent a7aa88b4c6
commit e5a78047b2
9 changed files with 8 additions and 10 deletions
+1 -7
View File
@@ -4,10 +4,4 @@ docker-compose.testing.yml
README.md
LICENSE
Makefile
world.sql
test-docker.sh
phpmyadmin_test.py
config.test.inc.php
test-mariadb.ini
test-mysql.ini
Dockerfile-testing
testing
+1 -2
View File
@@ -15,8 +15,7 @@ services:
phpmyadmin:
build:
context: .
dockerfile: Dockerfile-testing
context: testing/
container_name: phpmyadmin_testing
volumes:
- /sessions
+6 -1
View File
@@ -81,7 +81,12 @@ done
# Perform tests
if [ $ret -eq 0 ] ; then
python phpmyadmin_test.py --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
if [ -f ./phpmyadmin_test.py ] ; then
FILENAME=./phpmyadmin_test.py
else
FILENAME=./testing/phpmyadmin_test.py
fi
python $FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
ret=$?
fi
View File