openstack/diskimage-builder
Code Issues Proposed changes

Fix test cleanup trap to cleanup tmpdir

Browse Source 
We have a bug where we are overriding the tmpdir cleanup with the docker
image rm cleanup. We should be doing both.

Change-Id: I678c6248c1902095352a454618e3bdb9ed73630a
This commit is contained in:
Gregory Haynes 2015-07-22 03:57:09 -07:00
parent 4c0482e91c
commit 9e1cef01ec
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_functions.bash
View File

@ -14,8 +14,7 @@ function build_test_image() {
dest_dir=$(mktemp -d) dest_dir=$(mktemp -d)
base_dest=$(basename $dest_dir) base_dest=$(basename $dest_dir)
trap "rm -rf $dest_dir" EXIT trap "rm -rf $dest_dir; docker rmi $base_dest/image" EXIT
trap "docker rmi $base_dest/image" EXIT
ELEMENTS_PATH=$DIB_ELEMENTS:$TEST_ELEMENTS \ ELEMENTS_PATH=$DIB_ELEMENTS:$TEST_ELEMENTS \
$DIB_CMD -x $type_arg --docker-target=$base_dest/image \ $DIB_CMD -x $type_arg --docker-target=$base_dest/image \