Merge "Fix test cleanup trap to cleanup tmpdir"

2015-09-16 14:53:35 +00:00 · 2015-09-16 14:53:35 +00:00 · 801bd2a5be
commit 801bd2a5be
parent 5bae00db0c 9e1cef01ec
1 changed files with 1 additions and 2 deletions
--- a/tests/test_functions.bash
+++ b/tests/test_functions.bash
@ -14,8 +14,7 @@ function build_test_image() {
    dest_dir=$(mktemp -d)
    base_dest=$(basename $dest_dir)

-    trap "rm -rf $dest_dir" EXIT
-    trap "docker rmi $base_dest/image" EXIT
+    trap "rm -rf $dest_dir; docker rmi $base_dest/image" EXIT

    ELEMENTS_PATH=$DIB_ELEMENTS:$TEST_ELEMENTS \
        $DIB_CMD -x $type_arg --docker-target=$base_dest/image \