mirror of
https://github.com/phpmyadmin/docker.git
synced 2026-08-24 02:24:16 -05:00
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:
+1
-7
@@ -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
|
||||
|
||||
@@ -15,8 +15,7 @@ services:
|
||||
|
||||
phpmyadmin:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile-testing
|
||||
context: testing/
|
||||
container_name: phpmyadmin_testing
|
||||
volumes:
|
||||
- /sessions
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user