From c118c45f89d912c22f6784047eda65209ed9df5b Mon Sep 17 00:00:00 2001 From: Brandon Lum Date: Fri, 19 Jul 2019 10:08:53 -0400 Subject: [PATCH] Change image_enc_test so that it more reliably delete images Signed-off-by: Brandon Lum Signed-off-by: Stefan Berger --- image_enc_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/image_enc_test.go b/image_enc_test.go index 97499715c..97c242930 100644 --- a/image_enc_test.go +++ b/image_enc_test.go @@ -161,10 +161,15 @@ func TestImageEncryption(t *testing.T) { Parameters: dcparameters, }, } + // Clean up function cancels lease before deleting the image so the images are + // properly deleted + defer func() { + done(ctx) + client.ImageService().Delete(ctx, imageName, images.SynchronousDelete()) + client.ImageService().Delete(ctx, encImageName, images.SynchronousDelete()) + }() // Perform decryption of image - defer client.ImageService().Delete(ctx, imageName, images.SynchronousDelete()) - defer client.ImageService().Delete(ctx, encImageName, images.SynchronousDelete()) lf = func(desc ocispec.Descriptor) bool { return true }