Skip to content

Commit 3610576

Browse files
authored
test: Fix up some remnants of old usage (#137)
1 parent f9dcf8f commit 3610576

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ post_install_actions:
217217
relationships+=($(./platformsh/generate_{{ $service_def.type }}_relationship.sh '{{ $relationship_name }}' | ${BASE64_ENCODE}))
218218
{{ $service_addon := get $supported_services $service_def.type }}
219219
{{ if $service_addon }}
220-
echo "Running 'ddev get {{ $service_addon }}'"
220+
echo "Running 'ddev add-on get {{ $service_addon }}'"
221221
ddev add-on get {{ $service_addon }}
222222
{{ end }}
223223
{{ end }}

tests/per_test.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ per_test_setup() {
55
set +u
66
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
77
rm -rf ${TESTDIR} && mkdir -p ${TESTDIR} && cd ${TESTDIR}
8-
curl -sfL -o /tmp/testtemplate.tgz "https://github.com/platformsh-templates/${template}/tarball/master"
9-
tar -zxf /tmp/testtemplate.tgz --strip-components=1
8+
run curl -sfL -o /tmp/testtemplate.tgz "https://github.com/platformsh-templates/${template}/tarball/master"
9+
assert_success
10+
run tar -zxf /tmp/testtemplate.tgz --strip-components=1
11+
assert_success
1012
# If the template happens to have a .ddev directory, remove as it can break things
1113
rm -rf .ddev
1214
# Start with bogus settings so we know we got the right stuff when testing
13-
ddev config --project-name=${PROJNAME} --php-version=5.6 --database=mariadb:10.1 --docroot=x --project-type=php --web-environment-add=PLATFORMSH_CLI_TOKEN=notokenrightnow,PLATFORM_PROJECT=notyet,PLATFORM_ENVIRONMENT=notyet
15+
run ddev config --project-name=${PROJNAME} --php-version=5.6 --database=mariadb:10.1 --docroot=x --project-type=php --web-environment-add=PLATFORMSH_CLI_TOKEN=notokenrightnow,PLATFORM_PROJECT=notyet,PLATFORM_ENVIRONMENT=notyet
16+
assert_success
1417
echo "# doing ddev add-on get $source with template ${template} PROJNAME=${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
1518
run ddev add-on get ${PROJECT_SOURCE}
1619
assert_success

0 commit comments

Comments
 (0)