@@ -27,7 +27,7 @@ setup() {
2727 export DIR=" $( cd " $( dirname " ${BATS_TEST_FILENAME} " ) /.." > /dev/null 2>&1 && pwd) "
2828 export PROJNAME=" test-$( basename " ${GITHUB_REPO} " ) "
2929 mkdir -p ~ /tmp
30- export TESTDIR=$( mktemp -d ~ /tmp/ ${PROJNAME} .XXXXXX)
30+ export TESTDIR=$( mktemp -d -t ${PROJNAME} .XXXXXX)
3131 export DDEV_NONINTERACTIVE=true
3232 export DDEV_NO_INSTRUMENTATION=true
3333 ddev delete -Oy " ${PROJNAME} " > /dev/null 2>&1 || true
@@ -56,9 +56,7 @@ health_checks() {
5656 assert_output --partial " ${HTML_ASSERT} "
5757
5858 echo " Docs via HTTP from outside to http://${PROJNAME} .ddev.site:1337 is shown" >&3
59- echo " Curling again..."
60- curl -s -H ' Content-Type: text/html' -X GET http://${PROJNAME} .ddev.site:1337
61- run curl -s -H ' Content-Type: text/html' -X GET http://${PROJNAME} .ddev.site:1337
59+ run curl -sfL http://${PROJNAME} .ddev.site:1337
6260 assert_success
6361 assert_output --partial " ${HTML_ASSERT} "
6462
@@ -71,7 +69,9 @@ health_checks() {
7169teardown () {
7270 set -eu -o pipefail
7371 ddev delete -Oy ${PROJNAME} > /dev/null 2>&1
74- [ " ${TESTDIR} " != " " ] && rm -rf ${TESTDIR}
72+ echo " Teardown ${TESTDIR} " >&3
73+ ls -lR ${TESTDIR} >&3
74+ [ " ${TESTDIR} " != " " ] && rm -rf ${TESTDIR} || true
7575}
7676
7777@test " install from directory" {
@@ -85,12 +85,12 @@ teardown() {
8585}
8686
8787# bats test_tags=release
88- # @test "install from release" {
89- # set -eu -o pipefail
90- # echo "# ddev add-on get ${GITHUB_REPO} with project ${PROJNAME} in $(pwd)" >&3
91- # run ddev add-on get "${GITHUB_REPO}"
92- # assert_success
93- # run ddev restart -y
94- # assert_success
95- # health_checks
96- # }
88+ @test " install from release" {
89+ set -eu -o pipefail
90+ echo " # ddev add-on get ${GITHUB_REPO} with project ${PROJNAME} in $( pwd) " >&3
91+ run ddev add-on get " ${GITHUB_REPO} "
92+ assert_success
93+ run ddev restart -y
94+ assert_success
95+ health_checks
96+ }
0 commit comments