From 2c75fcc373a6824f897d10d1141160fd62b88e70 Mon Sep 17 00:00:00 2001 From: Per Cederberg Date: Mon, 16 Jan 2017 21:50:26 +0100 Subject: [PATCH 1/2] Fixed assert() when no stdin and bash nounset --- assert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assert.sh b/assert.sh index ffd2b95..0e07a18 100644 --- a/assert.sh +++ b/assert.sh @@ -111,7 +111,7 @@ assert() { result="$(sed -e :a -e '$!N;s/\n/\\n/;ta' <<< "$result")" [[ -z "$result" ]] && result="nothing" || result="\"$result\"" [[ -z "$2" ]] && expected="nothing" || expected="\"$2\"" - _assert_fail "expected $expected${_indent}got $result" "$1" "$3" + _assert_fail "expected $expected${_indent}got $result" "$1" "${3:-}" } assert_raises() { From 30d1fa9949d31eed0c169da86aef17594203065d Mon Sep 17 00:00:00 2001 From: Per Cederberg Date: Mon, 16 Jan 2017 21:52:59 +0100 Subject: [PATCH 2/2] Fixed assert_raises() when no stdin and nounset --- assert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assert.sh b/assert.sh index 0e07a18..ade5039 100644 --- a/assert.sh +++ b/assert.sh @@ -125,7 +125,7 @@ assert_raises() { [[ -z "$DEBUG" ]] || echo -n . return fi - _assert_fail "program terminated with code $status instead of $expected" "$1" "$3" + _assert_fail "program terminated with code $status instead of $expected" "$1" "${3:-}" } _assert_fail() {