diff options
Diffstat (limited to 'test/librechroot-test.sh')
-rw-r--r-- | test/librechroot-test.sh | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh index 93e7833..31f9237 100644 --- a/test/librechroot-test.sh +++ b/test/librechroot-test.sh @@ -24,10 +24,9 @@ it_respects_exit_status_if_out_isnt_a_tty() ( require network sudo || return 0 set -o pipefail libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty - r=0 - { testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || r=$? + { testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || status=$? - [[ $r == 3 ]] + [[ $status == 3 ]] ) it_creates_ca_certificates() { @@ -102,17 +101,17 @@ it_displays_help_as_normal_user() { } it_otherwise_fails_as_normal_user() { - librechroot -l "$roundup_test_name" run true >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + librechroot -l "$roundup_test_name" run true >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } it_displays_help_and_fails_with_0_args() { - LC_ALL=C librechroot -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + LC_ALL=C librechroot -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout [[ "$(sed -n 2p $tmpdir/stderr)" =~ Usage:.* ]] } @@ -131,9 +130,9 @@ it_obeys_the_n_flag() { # requires sudo so we know it's not failing because it needs root it_fails_for_unknown_commands() { require sudo || return 0 - testsudo librechroot phony >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + testsudo librechroot phony >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } @@ -141,17 +140,17 @@ it_fails_for_unknown_commands() { # requires sudo so we know it's not failing because it needs root it_fails_for_unknown_flags() { require sudo || return 0 - testsudo librechroot -q >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + testsudo librechroot -q >$tmpdir/stdout 2>$tmpdir/stderr || status=$? - [[ $stat != 0 ]] + [[ $status != 0 ]] empty $tmpdir/stdout not empty $tmpdir/stderr } it_fails_when_syncing_a_copy_with_itself() { require sudo || return 0 - testsudo timeout 5 librechroot -l root sync || stat=$? - case $stat in + testsudo timeout 5 librechroot -l root sync || status=$? + case $status in 0|124|137) # success|timeout+TERM|timeout+KILL false;; *) |