From bcf92d3f53dc396a9a0350be4347b7c71f77f68e Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Tue, 13 Aug 2024 10:49:05 +0200 Subject: [PATCH] Fix flaky TestCreateZipFileAndAddFiles/write_one_file - 2nd round (#27923) --- server/channels/app/file_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/channels/app/file_test.go b/server/channels/app/file_test.go index 959f99995c..fdda2d7ce0 100644 --- a/server/channels/app/file_test.go +++ b/server/channels/app/file_test.go @@ -321,14 +321,16 @@ func TestCreateZipFileAndAddFiles(t *testing.T) { t.Run("write one file", func(t *testing.T) { mockBackend := filesStoreMocks.FileBackend{} mockBackend.On("WriteFile", mock.Anything, path.Join(directory, zipName)).Return(int64(666), nil).Run(func(args mock.Arguments) { - now := time.Now() r, err := zip.OpenReader(zipName) require.NoError(t, err) require.Len(t, r.File, 1) file := r.File[0] assert.Equal(t, "file1", file.Name) - assert.GreaterOrEqual(t, file.Modified, now.Truncate(time.Second)) // Files are stored with a second precision + now := time.Now().Truncate(time.Second) // Files are stored with a second precision + // Confirm that the file was created in the last 10 seconds + assert.GreaterOrEqual(t, file.Modified, now.Add(-10*time.Second)) + assert.GreaterOrEqual(t, now, file.Modified) fr, err := file.Open() require.NoError(t, err)