diff options
Diffstat (limited to 'test/lib/common.bash')
| -rw-r--r-- | test/lib/common.bash | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/lib/common.bash b/test/lib/common.bash index b7e9c10..12daee0 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -7,8 +7,8 @@ fi # per-test setup/teardown ############################################ -common_before() { - tmpdir="$(mktemp -d --tmpdir "test-${roundup_desc//\//-}.${roundup_test_name}.XXXXXXXXXXXX")" +common_setup() { + tmpdir="$(mktemp -d --tmpdir "test-${BATS_TEST_NAME}.XXXXXXXXXXXX")" chmod 755 "$tmpdir" status=0 @@ -59,7 +59,7 @@ common_before() { mkdir -p -- "$tmpdir"/workdir/{pkg,src,srcpkg,log}dest } -common_after() { +common_teardown() { gpg-connect-agent KILLAGENT /bye || true if [[ -f "$tmpdir/.used-sudo" ]]; then sudo rm -rf -- "$tmpdir" @@ -68,12 +68,12 @@ common_after() { fi } -before() { - common_before +setup() { + common_setup } -after() { - common_after +teardown() { + common_teardown } # Utility functions for use in test definitions ###################### @@ -91,7 +91,6 @@ require() ( missing+=('btrfs') fi if (( ${#missing[@]} )); then - libremessages warning "Next test requires %s; Skipping (passing)..." "$(echo "${missing[*]}"|sed 's/ /, /g')" &>/dev/tty return 1 fi if libremessages in_array "sudo" "$@"; then |