diff options
Diffstat (limited to 'test/lib-blacklist-test.sh')
| -rw-r--r-- | test/lib-blacklist-test.sh | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/test/lib-blacklist-test.sh b/test/lib-blacklist-test.sh index c496167..9dfd5da 100644 --- a/test/lib-blacklist-test.sh +++ b/test/lib-blacklist-test.sh @@ -45,26 +45,26 @@ it_works_with_colons_in_reason() { v="$(libreblacklist get-reason <<<"$line")"; [[ $v == 'my:reason' ]] } -it_fails_update_when_there_is_no_blacklist_or_network() { +it_fails_update_with_no_blacklist_or_network() { mkdir -p $XDG_CONFIG_HOME/libretools echo "BLACKLIST='phony://example.com'" >$XDG_CONFIG_HOME/libretools/libretools.conf libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] + empty $tmpdir/stdout + not empty $tmpdir/stderr } -it_fails_cat_when_there_is_no_blacklist_or_network() { +it_fails_cat_with_no_blacklist_or_network() { mkdir -p $XDG_CONFIG_HOME/libretools echo "BLACKLIST='phony://example.com'" >$XDG_CONFIG_HOME/libretools/libretools.conf libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] + empty $tmpdir/stdout + not empty $tmpdir/stderr } it_fails_update_when_BLACKLIST_is_unset() { @@ -74,8 +74,8 @@ it_fails_update_when_BLACKLIST_is_unset() { libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] + empty $tmpdir/stdout + not empty $tmpdir/stderr } it_fails_cat_when_syntax_error_in_conf() { @@ -86,8 +86,8 @@ it_fails_cat_when_syntax_error_in_conf() { libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] + empty $tmpdir/stdout + not empty $tmpdir/stderr } it_downloads_the_blacklist_as_needed() { @@ -97,7 +97,7 @@ it_downloads_the_blacklist_as_needed() { libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr - [[ -n "$(cat $tmpdir/stdout)" ]] + not empty $tmpdir/stdout } it_downloads_the_blacklist_repeatedly() { @@ -110,23 +110,23 @@ it_downloads_the_blacklist_repeatedly() { } it_displays_help_and_fails_with_no_args() { - LANG=C libreblacklist >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + LC_ALL=C libreblacklist >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] + empty $tmpdir/stdout [[ "$(sed 1q $tmpdir/stderr)" =~ 'Usage: libreblacklist ' ]] } it_displays_help_when_given_h() { - LANG=C libreblacklist -h >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C libreblacklist -h >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" =~ 'Usage: libreblacklist ' ]] - [[ -z "$(cat $tmpdir/stderr)" ]] + empty $tmpdir/stderr } it_displays_help_when_given_h_cat() { - LANG=C libreblacklist -h cat >$tmpdir/stdout 2>$tmpdir/stderr + LC_ALL=C libreblacklist -h cat >$tmpdir/stdout 2>$tmpdir/stderr [[ "$(sed 1q $tmpdir/stdout)" == 'Usage: libreblacklist cat' ]] - [[ -z "$(cat $tmpdir/stderr)" ]] + empty $tmpdir/stderr } |