Various improvements to the testing shell scripts by wilzbach · Pull Request #1368 · dlang/dub

wilzbach · 2018-02-10T12:24:28Z

See also: #1339

[CI]: Update setup-dlang GitHub org name
[test]: Make scripts more portable by not assuming bash location
[scripts/ci/travis.sh]: Error on unset bash variables
[scripts/ci/travis.sh]: Make host dub unavailable implicitly

dlang-bot · 2018-02-10T12:24:29Z

Thanks for your pull request, @wilzbach!

PetarKirov · 2019-08-08T10:25:31Z

Your first commit seems to have some merge problems (note the 2 re-arranged if-then-s):

diff --git test/fetchzip.sh test/fetchzip.sh
index 723e698..4bbac58 100755
--- test/fetchzip.sh
+++ test/fetchzip.sh
@@ -5,7 +5,7 @@ DIR=$(dirname "${BASH_SOURCE[0]}")
 
 PORT=$(($$ + 1024)) # PID + 1024
 
-dub remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null || true
+"$DUB" remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null || true
 
 "$DUB" build --single "$DIR"/test_registry.d
 "$DIR"/test_registry --folder="$DIR/issue1336-registry" --port=$PORT &
@@ -18,7 +18,7 @@ timeout 1s "$DUB" fetch gitcompatibledubpackage --version=1.0.4 --skip-registry=
 if [ $? -eq 124 ]; then
     die 'Fetching from responsive registry should not time-out.'
 fi
-dub remove gitcompatibledubpackage --non-interactive --version=1.0.4
+"$DUB" remove gitcompatibledubpackage --non-interactive --version=1.0.4
 
 echo "Downloads should be retried when the zip is corrupted - gitcompatibledubpackage (1.0.3)"
 zipOut=$(! timeout 1s "$DUB" fetch gitcompatibledubpackage --version=1.0.3 --skip-registry=all --registry=http://localhost:$PORT 2>&1)
@@ -32,8 +32,8 @@ if ! zipCount=$(grep -Fc 'Failed to extract zip archive' <<<"$zipOut") || [ "$zi
 elif [ $rc -eq 124 ]; then
     die 'DUB timed out unexpectedly.'
 fi
-if dub remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then
     die 'DUB should not have installed a broken package.'
+if "$DUB" remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then
 fi
 
 echo "HTTP status errors on downloads should be retried - gitcompatibledubpackage (1.0.2)"
@@ -47,8 +47,8 @@ if ! retryCount=$(echo "$retryOut" | grep -Fc 'Bad Gateway') || [ "$retryCount"
 elif [ $rc -eq 124 ]; then
     die 'DUB timed out unexpectedly.'
 fi
-if dub remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then
     die 'DUB should not have installed a package.'
+if "$DUB" remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then
 fi
 
 echo "HTTP status errors on downloads should retry with fallback mirror - gitcompatibledubpackage (1.0.2)"
@@ -56,4 +56,4 @@ timeout 1s "$DUB" fetch gitcompatibledubpackage --version=1.0.2 --skip-registry=
 if [ $? -eq 124 ]; then
     die 'Fetching from responsive registry should not time-out.'
 fi
-dub remove gitcompatibledubpackage --non-interactive --version=1.0.2
+"$DUB" remove gitcompatibledubpackage --non-interactive --version=1.0.2

Fixed:

diff --git test/fetchzip.sh test/fetchzip.sh
index 4bbac58..6839a44 100755
--- test/fetchzip.sh
+++ test/fetchzip.sh
@@ -32,8 +32,8 @@ if ! zipCount=$(grep -Fc 'Failed to extract zip archive' <<<"$zipOut") || [ "$zi
 elif [ $rc -eq 124 ]; then
     die 'DUB timed out unexpectedly.'
 fi
-    die 'DUB should not have installed a broken package.'
 if "$DUB" remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then
+    die 'DUB should not have installed a broken package.'
 fi
 
 echo "HTTP status errors on downloads should be retried - gitcompatibledubpackage (1.0.2)"
@@ -47,8 +47,8 @@ if ! retryCount=$(echo "$retryOut" | grep -Fc 'Bad Gateway') || [ "$retryCount"
 elif [ $rc -eq 124 ]; then
     die 'DUB timed out unexpectedly.'
 fi
-    die 'DUB should not have installed a package.'
 if "$DUB" remove gitcompatibledubpackage --non-interactive --version=* 2>/dev/null; then
+    die 'DUB should not have installed a package.'
 fi
 
 echo "HTTP status errors on downloads should retry with fallback mirror - gitcompatibledubpackage (1.0.2)"

And rebased.

PetarKirov · 2020-11-27T12:15:49Z

I have resolved the merge conflicts (more like redid the PR from the beginning 😄 ) and I will push an update soon

* Add comments to the script * Print information on the detected HOST_DUB and DC env variables

Geod24

Looks about right, just a few nits / questions

Geod24 · 2020-11-27T16:13:31Z

scripts/ci/travis.sh

 }

-if [ "$COVERAGE" = true ]; then
+if [ "${COVERAGE:-}" = true ]; then


You don't need the quotes then, do you ?

Geod24 · 2020-11-27T16:13:34Z

scripts/ci/travis.sh

 ## Here the `COVERAGE` variable is abused for this purpose,
 ## as it's only defined once in the whole Travis matrix
-if [ "$COVERAGE" = true ]; then
+if [ "${COVERAGE:-}" = true ]; then


Geod24 · 2020-11-27T16:15:11Z

scripts/ci/travis.sh

+export HOST_DUB
+HOST_DUB="$(command -v dub)" ||
+  { echo >&2 "[ERROR] 'dub' should be available"; exit 1; }


Can't those lines be merged ?

Geod24 · 2020-11-27T16:16:01Z

scripts/ci/travis.sh

+hash -p /dev/null/dub dub
+
+# 2/3 Verify that both 'dub' and "$DUB" are not available:
+dub > /dev/null 2>&1 || command -v "${DUB:-}" >/dev/null && \


Use dub -h maybe ?

Geod24 · 2020-11-27T16:16:49Z

scripts/ci/travis.sh

+
+# 2/3 Verify that both 'dub' and "$DUB" are not available:
+dub > /dev/null 2>&1 || command -v "${DUB:-}" >/dev/null && \
+  { echo >&2 "[ERROR] 'dub' shouldn't be available"; exit 1; }


shouldn't be available "anymore" ?
Otherwise the error message might be confusing.

Geod24 · 2020-11-27T16:17:01Z

scripts/ci/travis.sh

+HOST_DUB="$(command -v dub)" ||
+  { echo >&2 "[ERROR] 'dub' should be available"; exit 1; }
+unset DUB
+hash -p /dev/null/dub dub


I've no idea what this does. Do you have a link for me ?

dlang-bot added the WIP label Feb 10, 2018

wilzbach mentioned this pull request Feb 10, 2018

more reliable retries and fallback mirror usage - #1336 #1339

Merged

wilzbach force-pushed the dub-binary branch from f843a80 to d6613b2 Compare February 10, 2018 15:51

wilzbach mentioned this pull request Feb 12, 2018

[Trivial] Need to use '/usr/bin/env bash' instead of '/bin/bash' #1376

Merged

PetarKirov force-pushed the dub-binary branch from d6613b2 to 7e98a97 Compare August 8, 2019 10:25

PetarKirov force-pushed the dub-binary branch 16 times, most recently from 6eaa1c3 to e02f89d Compare August 8, 2019 15:06

PetarKirov changed the title ~~[WIP] Use $DUB instead of dub and ensure that global DUB isn't available in the testsuite~~ Various improvements to the testing shell scripts Nov 27, 2020

PetarKirov force-pushed the dub-binary branch from e02f89d to 7ab6c02 Compare November 27, 2020 12:51

PetarKirov added 2 commits November 27, 2020 14:55

[CI]: Update setup-dlang GitHub org name

9ef6d79

[test]: Make scripts more portable by not assuming bash location

3d17d49

PetarKirov force-pushed the dub-binary branch 2 times, most recently from 0babc44 to 8367462 Compare November 27, 2020 13:38

PetarKirov force-pushed the dub-binary branch 2 times, most recently from 36641fe to 36ad3b2 Compare November 27, 2020 14:01

PetarKirov added 2 commits November 27, 2020 16:09

[scripts/ci/travis.sh]: Error on unset bash variables

67d3e5f

[scripts/ci/travis.sh]: Make host dub unavailable implicitly

2f9101b

* Add comments to the script * Print information on the detected HOST_DUB and DC env variables

PetarKirov force-pushed the dub-binary branch from 36ad3b2 to 2f9101b Compare November 27, 2020 14:10

Geod24 reviewed Nov 27, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Comments

Various improvements to the testing shell scripts#1368

Various improvements to the testing shell scripts#1368
wilzbach wants to merge 4 commits intodlang:masterfrom
wilzbach:dub-binary

wilzbach commented Feb 10, 2018 •

edited by PetarKirov

Loading

Uh oh!

dlang-bot commented Feb 10, 2018

Uh oh!

PetarKirov commented Aug 8, 2019

Uh oh!

PetarKirov commented Nov 27, 2020

Uh oh!

Geod24 left a comment

Uh oh!

Geod24 Nov 27, 2020

Uh oh!

Geod24 Nov 27, 2020

Uh oh!

Geod24 Nov 27, 2020

Uh oh!

Geod24 Nov 27, 2020

Uh oh!

Geod24 Nov 27, 2020

Uh oh!

Geod24 Nov 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Comments

Conversation

wilzbach commented Feb 10, 2018 • edited by PetarKirov Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dlang-bot commented Feb 10, 2018

Uh oh!

PetarKirov commented Aug 8, 2019

Uh oh!

PetarKirov commented Nov 27, 2020

Uh oh!

Geod24 left a comment

Choose a reason for hiding this comment

Uh oh!

Geod24 Nov 27, 2020

Choose a reason for hiding this comment

Uh oh!

Geod24 Nov 27, 2020

Choose a reason for hiding this comment

Uh oh!

Geod24 Nov 27, 2020

Choose a reason for hiding this comment

Uh oh!

Geod24 Nov 27, 2020

Choose a reason for hiding this comment

Uh oh!

Geod24 Nov 27, 2020

Choose a reason for hiding this comment

Uh oh!

Geod24 Nov 27, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wilzbach commented Feb 10, 2018 •

edited by PetarKirov

Loading