Skip to content

Commit 4bdb899

Browse files
committed
Update tests
1 parent c21d2e4 commit 4bdb899

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ buildx-imagetools-create:
6666
.PHONY: buildx-imagetools-create
6767

6868
test:
69-
cd ./tests/basic && IMAGE=$(REPO):$(TAG) ./run.sh
70-
cd ./tests/php && IMAGE=$(REPO):$(TAG) ./run.sh
71-
cd ./tests/wordpress && IMAGE=$(REPO):$(TAG) ./run.sh
72-
cd ./tests/drupal/11 && IMAGE=$(REPO):$(TAG) ./run.sh
69+
# cd ./tests/basic && IMAGE=$(REPO):$(TAG) ./run.sh
70+
# cd ./tests/php && IMAGE=$(REPO):$(TAG) ./run.sh
71+
# cd ./tests/wordpress && IMAGE=$(REPO):$(TAG) ./run.sh
72+
# cd ./tests/drupal/11 && IMAGE=$(REPO):$(TAG) ./run.sh
7373
cd ./tests/drupal/10 && IMAGE=$(REPO):$(TAG) ./run.sh
7474
cd ./tests/drupal/7 && IMAGE=$(REPO):$(TAG) ./run.sh
7575
cd ./tests/matomo && PLATFORM=$(PLATFORM) IMAGE=$(REPO):$(TAG) ./run.sh

tests/drupal/10/run.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ nginx_exec() {
1313
clean_exit() {
1414
docker compose down -v
1515
}
16-
trap clean_exit EXIT
16+
#trap clean_exit EXIT
1717

1818
docker compose up -d
1919

@@ -34,10 +34,8 @@ echo -n "cron... "
3434
nginx_exec curl -s -S -I "localhost/cron" | grep '302 Found'
3535
echo -n "index.php... "
3636
nginx_exec curl -s -S -I "localhost/index.php" | grep '302 Found'
37-
echo -n "index.php?node... "
38-
nginx_exec curl -s -S -I "localhost/index.php?node" | grep '302 Found'
39-
echo -n "index.php/?node..."
40-
nginx_exec curl -s -S -I "localhost/index.php/?node" | grep '302 Moved Temporarily'
37+
echo -n "index.php/node... "
38+
nginx_exec curl -s -S -I "localhost/index.php/node" | grep '302 Found'
4139
echo -n "update.php... "
4240
nginx_exec curl -s -S -I "localhost/update.php" | grep '302 Found'
4341
echo -n ".htaccess... "

tests/drupal/11/run.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ echo -n "cron... "
3232
nginx_exec curl -s -S -I "localhost/cron" | grep '302 Found'
3333
echo -n "index.php... "
3434
nginx_exec curl -s -S -I "localhost/index.php" | grep '302 Found'
35-
echo -n "index.php?node... "
36-
nginx_exec curl -s -S -I "localhost/index.php?node" | grep '302 Found'
37-
echo -n "index.php/?node..."
38-
nginx_exec curl -s -S -I "localhost/index.php/?node" | grep '302 Found'
35+
echo -n "index.php/node... "
36+
nginx_exec curl -s -S -I "localhost/index.php/node" | grep '302 Found'
3937
echo -n "update.php... "
4038
nginx_exec curl -s -S -I "localhost/update.php" | grep '302 Found'
4139
echo -n ".htaccess... "

tests/drupal/7/run.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ echo -n "cron.php... "
3030
nginx_exec curl -s -S -I "localhost/cron.php" | grep '302 Found'
3131
echo -n "index.php... "
3232
nginx_exec curl -s -S -I "localhost/index.php" | grep '302 Found'
33-
echo -n "index.php?node... "
34-
nginx_exec curl -s -S -I "localhost/index.php?node" | grep '302 Found'
35-
echo -n "index.php/?node..."
36-
nginx_exec curl -s -S -I "localhost/index.php/?node" | grep '302 Moved Temporarily'
33+
echo -n "index.php/node... "
34+
nginx_exec curl -s -S -I "localhost/index.php/node" | grep '302 Found'
3735
echo -n "install.php... "
3836
nginx_exec curl -s -S -I "localhost/install.php" | grep '200 OK'
3937
echo -n "update.php... "

0 commit comments

Comments
 (0)