github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Change image_enc_test so that it more reliably delete images

Browse Source 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Brandon Lum 2019-07-19 10:08:53 -04:00
parent c6d437fd70
commit c118c45f89
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
image_enc_test.go
View File

@ -161,10 +161,15 @@ func TestImageEncryption(t *testing.T) {
Parameters: dcparameters, 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 // 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 { lf = func(desc ocispec.Descriptor) bool {
return true return true
} }