Skip to content

Commit ea5e231

Browse files
authored
Fix broken tests and shellcheck issues (#7)
- Fix broken tests (`devcontainer` CLI no longer seems to output everything to stderr, so remove redirection) - Fix minor quoting issues identified by shellcheck
1 parent a4efc74 commit ea5e231

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

test/barebones-ruby/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "$(dirname "$0")/../harness.sh"
44

55
setup "barebones-ruby" "3.2.0"
66

7-
run_test "Ruby version is correct" "ruby -v" $IMAGE_TAG
7+
run_test "Ruby version is correct" "ruby -v" "$IMAGE_TAG"
88
run_test "Sample script runs" "ruby sample.rb" "Hello world"
99
run_test "Container defaults to non-root user" "whoami" "devcontainer"
1010
run_test "Non-root user is able to sudo" "sudo whoami" "root"

test/harness.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ run_test() {
7070
#
7171
# We _want_ $cmd to be split here as it could include arguments:
7272
# shellcheck disable=SC2086
73-
result=$(devcontainer exec --workspace-folder "$TEST_DIR" --id-label "$ID_LABEL" $cmd 2>&1 1> /dev/null || true)
73+
result=$(devcontainer exec --workspace-folder "$TEST_DIR" --id-label "$ID_LABEL" $cmd || true)
7474

7575
case "$result" in
7676
*$expected_result*)
@@ -93,6 +93,6 @@ end_tests() {
9393

9494
# Succeed if there are no failed tests, but also make sure that at least one test has passed
9595
# (otherwise something else might have gone wrong)
96-
[ $FAILED_TESTS -eq 0 ] && [ $PASSED_TESTS -gt 0 ]
96+
[ "$FAILED_TESTS" -eq 0 ] && [ "$PASSED_TESTS" -gt 0 ]
9797
}
9898
trap "end_tests" EXIT

0 commit comments

Comments
 (0)