openstack/diskimage-builder
Code Issues Proposed changes

Fix tests/test_functions.bash

Browse Source 
I am not sure why we didn't hit it before, but
1. The command is 'docker images', not 'docker image'
2. Calling 'docker rmi' requires a check on image presence

Change-Id: I127359043f975a25bb1bfad7469dfe01be67e2d9
This commit is contained in:
Dmitry Tantsur 2015-09-30 11:54:31 +02:00
parent 89d1eaf5a5
commit c49b733fef
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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
docker rmi $base_dest/image if docker images | grep $base_dest/image ; then
docker rmi $base_dest/image
fi
} }
function run_disk_element_test() { function run_disk_element_test() {