sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix tests/test_functions.bash"

Browse Source
This commit is contained in:
Jenkins 2015-10-20 22:15:46 +00:00 committed by Gerrit Code Review
commit 48a9dd4d3d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_functions.bash
View File

@ -31,7 +31,7 @@ function build_test_image() {
echo "Found image $img_path." echo "Found image $img_path."
fi fi
else else
if ! docker image | grep $base_dest/image ; then if ! docker images | grep $base_dest/image ; then
echo "Error: No docker image with name $base_dest/image found!" echo "Error: No docker image with name $base_dest/image found!"
exit 1 exit 1
else else
@ -42,7 +42,9 @@ function build_test_image() {
trap EXIT trap EXIT
rm -rf $dest_dir rm -rf $dest_dir
if docker images | grep $base_dest/image ; then
docker rmi $base_dest/image docker rmi $base_dest/image
fi
} }
function run_disk_element_test() { function run_disk_element_test() {