From 828aeda9b1d021f9171b7bc9c371e9faf97c1221 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Sun, 29 Dec 2019 23:02:36 +0100 Subject: [PATCH] fix flapping TestFsStore_Cleanup (#504) --- backend/app/store/image/fs_store_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/app/store/image/fs_store_test.go b/backend/app/store/image/fs_store_test.go index 2fcfab24..e1b2f1ba 100644 --- a/backend/app/store/image/fs_store_test.go +++ b/backend/app/store/image/fs_store_test.go @@ -269,8 +269,14 @@ func TestFsStore_Cleanup(t *testing.T) { _, err = os.Stat(img1) assert.Error(t, err, "no file on staging anymore") + // sometimes two images for user1 are put into same directory, which means that + // after first image cleanup it's not empty and won't be deleted _, err = os.Stat(path.Dir(img1)) - assert.Error(t, err, "no dir %s on staging anymore", path.Dir(img1)) + if path.Dir(img1) != path.Dir(img2) { + assert.Error(t, err, "no dir %s on staging anymore", path.Dir(img1)) + } else { + assert.NoError(t, err, "dir %s still on staging", path.Dir(img1)) + } _, err = os.Stat(img2) assert.NoError(t, err, "file on staging")