From cf338cfedfd719970fcf3a8eb93b9c1875974f3b Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 20:02:49 +0800 Subject: [PATCH 01/22] fix(thumbnail):fixed assertions for thumbnail operation --- tests/cli_tests/zboxcli_download_test.go | 2 +- tests/cli_tests/zboxcli_file_update_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cli_tests/zboxcli_download_test.go b/tests/cli_tests/zboxcli_download_test.go index 4b00fd728e..91808e140f 100644 --- a/tests/cli_tests/zboxcli_download_test.go +++ b/tests/cli_tests/zboxcli_download_test.go @@ -574,7 +574,7 @@ func TestDownload(t *testing.T) { "localpath": "tmp/", "thumbnail": nil, }), false) - require.NotNil(t, err, strings.Join(output, "\n")) + require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) require.Equal(t, "Error in file operation: File content didn't match with uploaded file", output[1]) }) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 58a642f6b3..f248cab15a 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -38,7 +38,7 @@ func TestFileUpdate(t *testing.T) { "localpath": "tmp/", "thumbnail": true, }), false) - require.NotNil(t, err, strings.Join(output, "\n")) + require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) defer func() { From 7eafdec6f2bd324e98fed1435492a7a12b094d10 Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 20:30:19 +0800 Subject: [PATCH 02/22] fix(thumbnail):generate image file with base64 string --- .../flaky___broken_scenarios_test.go | 9 ++++-- tests/cli_tests/zboxcli_file_delete_test.go | 11 +++++--- tests/cli_tests/zboxcli_file_update_test.go | 28 ++++++++++++++++++- tests/cli_tests/zboxcli_upload_test.go | 10 ++++--- 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/tests/cli_tests/flaky___broken_scenarios_test.go b/tests/cli_tests/flaky___broken_scenarios_test.go index 5af7b09b94..c1e2c358e2 100644 --- a/tests/cli_tests/flaky___broken_scenarios_test.go +++ b/tests/cli_tests/flaky___broken_scenarios_test.go @@ -2,6 +2,7 @@ package cli_tests import ( + "encoding/base64" "encoding/json" "fmt" "os" @@ -539,12 +540,14 @@ func Test___FlakyBrokenScenarios(t *testing.T) { filesize := int64(0.5 * MB) remotepath := "/" thumbnail := "upload_thumbnail_test.png" - output, err := cliutils.RunCommandWithoutRetry(fmt.Sprintf("wget %s -O %s", "https://en.wikipedia.org/static/images/project-logos/enwiki-2x.png", thumbnail)) - require.Nil(t, err, "Failed to download thumbnail png file: ", strings.Join(output, "\n")) + //nolint + thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) + err := os.WriteFile(thumbnail, thumbnailBytes, os.ModePerm) + require.Nil(t, err, "failed to generate thumbnail", err) localFilePath := generateFileAndUploadWithParam(t, allocationID, remotepath, filesize, map[string]interface{}{"thumbnailpath": thumbnail}) - output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ + output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), "localpath": "tmp/", diff --git a/tests/cli_tests/zboxcli_file_delete_test.go b/tests/cli_tests/zboxcli_file_delete_test.go index 38ab3f30d6..543d0aba9b 100644 --- a/tests/cli_tests/zboxcli_file_delete_test.go +++ b/tests/cli_tests/zboxcli_file_delete_test.go @@ -1,6 +1,7 @@ package cli_tests import ( + "encoding/base64" "fmt" "os" "path" @@ -9,8 +10,6 @@ import ( "strings" "testing" - cliutils "github.com/0chain/system_test/internal/cli/util" - "github.com/stretchr/testify/require" ) @@ -203,8 +202,12 @@ func TestFileDelete(t *testing.T) { thumbnail := "upload_thumbnail_test.png" thumbnailPath := "./tmp/" + thumbnail - output, err := cliutils.RunCommandWithoutRetry("wget https://en.wikipedia.org/static/images/project-logos/enwiki-2x.png -O " + thumbnailPath) - require.Nil(t, err, "Failed to download thumbnail png file: ", strings.Join(output, "\n")) + + //nolint + thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) + err := os.WriteFile(thumbnailPath, thumbnailBytes, os.ModePerm) + require.Nil(t, err, "failed to generate thumbnail", err) + defer func() { os.Remove(thumbnailPath) }() diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index f248cab15a..97b8b9f307 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -1,6 +1,7 @@ package cli_tests import ( + "encoding/base64" "encoding/json" "fmt" "os" @@ -30,7 +31,7 @@ func TestFileUpdate(t *testing.T) { remotepath := "/" localFilePath := generateFileAndUpload(t, allocationID, remotepath, filesize) - thumbnailFile := updateFileWithThumbnailURL(t, "https://en.wikipedia.org/static/images/project-logos/enwiki-2x.png", allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) + thumbnailFile, thumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, @@ -38,9 +39,14 @@ func TestFileUpdate(t *testing.T) { "localpath": "tmp/", "thumbnail": true, }), false) + require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) + stats, err := os.Stat(thumbnailFile) + require.Nil(t, err, strings.Join(output, "\n")) + require.Equal(t, thumbnailSize, stats.Size()) + defer func() { // Delete the downloaded thumbnail file err = os.Remove(thumbnailFile) @@ -352,6 +358,26 @@ func TestFileUpdate(t *testing.T) { }) } +func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath string, size int64) (string, int) { + thumbnail := "upload_thumbnail_test.png" + + //nolint + thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) + err := os.WriteFile(thumbnail, thumbnailBytes, os.ModePerm) + require.Nil(t, err, "failed to generate thumbnail", err) + + output, err := updateFile(t, configPath, map[string]interface{}{ + "allocation": allocationID, + "remotepath": remotePath, + "localpath": localpath, + "thumbnailpath": thumbnail, + }, true) + require.Nil(t, err, strings.Join(output, "\n")) + require.Len(t, output, 2) + require.Equal(t, "Status completed callback. Type = application/octet-stream. Name = "+filepath.Base(localpath), output[1]) + return thumbnail, len(thumbnailBytes) +} + func updateFileWithThumbnailURL(t *testing.T, thumbnailURL, allocationID, remotePath, localpath string, size int64) string { thumbnail := "upload_thumbnail_test.png" output, err := cliutils.RunCommandWithoutRetry(fmt.Sprintf("wget %s -O %s", thumbnailURL, thumbnail)) diff --git a/tests/cli_tests/zboxcli_upload_test.go b/tests/cli_tests/zboxcli_upload_test.go index 73444f0427..10316dbf4b 100644 --- a/tests/cli_tests/zboxcli_upload_test.go +++ b/tests/cli_tests/zboxcli_upload_test.go @@ -1,8 +1,10 @@ package cli_tests import ( + "encoding/base64" "encoding/json" "fmt" + "os" "path/filepath" "regexp" "strings" @@ -209,8 +211,6 @@ func TestUpload(t *testing.T) { }) thumbnail := "upload_thumbnail_test.png" - output, err := cliutils.RunCommandWithoutRetry("wget https://en.wikipedia.org/static/images/project-logos/enwiki-2x.png -O " + thumbnail) - require.Nil(t, err, "Failed to download thumbnail png file: ", strings.Join(output, "\n")) filename := generateRandomTestFileName(t) err = createFileWithSize(filename, fileSize) @@ -242,8 +242,10 @@ func TestUpload(t *testing.T) { }) filename := "upload_image_test.png" - output, err := cliutils.RunCommandWithoutRetry("wget https://en.wikipedia.org/static/images/project-logos/enwiki-2x.png -O " + filename) - require.Nil(t, err, "Failed to download png file: ", strings.Join(output, "\n")) + //nolint + fileBytes, _ := base64.StdEncoding.DecodeString(`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`) + err := os.WriteFile(filename, fileBytes, os.ModePerm) + require.Nil(t, err, "failed to generate thumbnail", err) output, err = uploadFile(t, configPath, map[string]interface{}{ "allocation": allocationID, From 8f4405a6ab4cebe9dc4da65ff819fa5c96f291b0 Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 20:39:57 +0800 Subject: [PATCH 03/22] fix(thumbnail):fixed assertion for downloaded thumbnail --- tests/cli_tests/zboxcli_download_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/cli_tests/zboxcli_download_test.go b/tests/cli_tests/zboxcli_download_test.go index 91808e140f..64ddd5e44d 100644 --- a/tests/cli_tests/zboxcli_download_test.go +++ b/tests/cli_tests/zboxcli_download_test.go @@ -568,15 +568,20 @@ func TestDownload(t *testing.T) { err = os.Remove(filename) require.Nil(t, err) + localPath := "tmp/" + filepath.Base(filename) + output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(filename), - "localpath": "tmp/", + "localpath": localPath, "thumbnail": nil, }), false) require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) - require.Equal(t, "Error in file operation: File content didn't match with uploaded file", output[1]) + + stat, err := os.Stat(localPath) + require.Nil(t, err) + require.Equal(t, len(thumbnailBytes), stat.Size()) }) t.Run("Download to Non-Existent Path Should Work", func(t *testing.T) { From 8f6e6175ada9124dd9c8929bb7e7296d55d2155f Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 20:42:05 +0800 Subject: [PATCH 04/22] fix(thumbnail):fixed syntax issues --- tests/cli_tests/zboxcli_file_delete_test.go | 2 +- tests/cli_tests/zboxcli_upload_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_delete_test.go b/tests/cli_tests/zboxcli_file_delete_test.go index 543d0aba9b..4342556abb 100644 --- a/tests/cli_tests/zboxcli_file_delete_test.go +++ b/tests/cli_tests/zboxcli_file_delete_test.go @@ -216,7 +216,7 @@ func TestFileDelete(t *testing.T) { err = createFileWithSize(filename, filesize) require.Nil(t, err) - output, err = uploadFile(t, configPath, map[string]interface{}{ + output, err := uploadFile(t, configPath, map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath, "localpath": filename, diff --git a/tests/cli_tests/zboxcli_upload_test.go b/tests/cli_tests/zboxcli_upload_test.go index 10316dbf4b..ae9a2017f0 100644 --- a/tests/cli_tests/zboxcli_upload_test.go +++ b/tests/cli_tests/zboxcli_upload_test.go @@ -213,10 +213,10 @@ func TestUpload(t *testing.T) { thumbnail := "upload_thumbnail_test.png" filename := generateRandomTestFileName(t) - err = createFileWithSize(filename, fileSize) + err := createFileWithSize(filename, fileSize) require.Nil(t, err) - output, err = uploadFile(t, configPath, map[string]interface{}{ + output, err := uploadFile(t, configPath, map[string]interface{}{ "allocation": allocationID, "remotepath": "/", "localpath": filename, From 9a7271443c3fbc75c3a9360b9cf80ebc59e2e4d1 Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 21:04:23 +0800 Subject: [PATCH 05/22] fix(thumbnail):fixed syntax issues --- tests/cli_tests/zboxcli_upload_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cli_tests/zboxcli_upload_test.go b/tests/cli_tests/zboxcli_upload_test.go index ae9a2017f0..92cd397371 100644 --- a/tests/cli_tests/zboxcli_upload_test.go +++ b/tests/cli_tests/zboxcli_upload_test.go @@ -247,7 +247,7 @@ func TestUpload(t *testing.T) { err := os.WriteFile(filename, fileBytes, os.ModePerm) require.Nil(t, err, "failed to generate thumbnail", err) - output, err = uploadFile(t, configPath, map[string]interface{}{ + output, err := uploadFile(t, configPath, map[string]interface{}{ "allocation": allocationID, "remotepath": "/", "localpath": filename, From 0f08c5f5c5208bb391ece75686f6af9b6d7f549f Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 21:32:41 +0800 Subject: [PATCH 06/22] fix(thumbnail):fixed lint issue --- tests/cli_tests/zboxcli_file_update_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 97b8b9f307..47f41d6d3f 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -358,6 +358,7 @@ func TestFileUpdate(t *testing.T) { }) } +//nolint: unnamedResult func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath string, size int64) (string, int) { thumbnail := "upload_thumbnail_test.png" From ee5b34acee6b88f756acd0f147bb59ba10f0cf4a Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 21:35:11 +0800 Subject: [PATCH 07/22] fix(thumbnail):fixed lint issue --- tests/cli_tests/zboxcli_file_update_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 47f41d6d3f..6359d5c3e7 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -358,7 +358,7 @@ func TestFileUpdate(t *testing.T) { }) } -//nolint: unnamedResult +//nolint func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath string, size int64) (string, int) { thumbnail := "upload_thumbnail_test.png" From 1838550bbac6c1824d1c39cd5f2d392fb3373d7d Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 21:40:13 +0800 Subject: [PATCH 08/22] fix(thumbnail):fixed require.Equal type issue --- tests/cli_tests/zboxcli_download_test.go | 2 +- tests/cli_tests/zboxcli_file_update_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cli_tests/zboxcli_download_test.go b/tests/cli_tests/zboxcli_download_test.go index 64ddd5e44d..299fda82b2 100644 --- a/tests/cli_tests/zboxcli_download_test.go +++ b/tests/cli_tests/zboxcli_download_test.go @@ -581,7 +581,7 @@ func TestDownload(t *testing.T) { stat, err := os.Stat(localPath) require.Nil(t, err) - require.Equal(t, len(thumbnailBytes), stat.Size()) + require.Equal(t, len(thumbnailBytes), int(stat.Size())) }) t.Run("Download to Non-Existent Path Should Work", func(t *testing.T) { diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 6359d5c3e7..35f036cac6 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -45,7 +45,7 @@ func TestFileUpdate(t *testing.T) { stats, err := os.Stat(thumbnailFile) require.Nil(t, err, strings.Join(output, "\n")) - require.Equal(t, thumbnailSize, stats.Size()) + require.Equal(t, thumbnailSize, int(stats.Size())) defer func() { // Delete the downloaded thumbnail file From 3b26415090d84248b4643ca40a695546c8d108f0 Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 23:37:41 +0800 Subject: [PATCH 09/22] fix(thumbnail):improved code --- tests/cli_tests/zboxcli_download_test.go | 8 ++------ tests/cli_tests/zboxcli_file_update_test.go | 16 +++++++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/cli_tests/zboxcli_download_test.go b/tests/cli_tests/zboxcli_download_test.go index 299fda82b2..b949e93436 100644 --- a/tests/cli_tests/zboxcli_download_test.go +++ b/tests/cli_tests/zboxcli_download_test.go @@ -1,7 +1,6 @@ package cli_tests import ( - "encoding/base64" "encoding/json" "fmt" "os" @@ -549,10 +548,7 @@ func TestDownload(t *testing.T) { thumbnail := "upload_thumbnail_test.png" //nolint - thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) - - err := os.WriteFile(thumbnail, thumbnailBytes, os.ModePerm) - require.Nil(t, err, "failed to generate thumbnail", err) + thumbnailSize := generateThumbnail(t, thumbnail) defer func() { // Delete the downloaded thumbnail file @@ -581,7 +577,7 @@ func TestDownload(t *testing.T) { stat, err := os.Stat(localPath) require.Nil(t, err) - require.Equal(t, len(thumbnailBytes), int(stat.Size())) + require.Equal(t, thumbnailSize, int(stat.Size())) }) t.Run("Download to Non-Existent Path Should Work", func(t *testing.T) { diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 35f036cac6..99ddb59cfb 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -358,14 +358,20 @@ func TestFileUpdate(t *testing.T) { }) } +func generateThumbnail(t *testing.T, localpath string) int { + //nolint + thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) + err := os.WriteFile(localpath, thumbnailBytes, os.ModePerm) + require.Nil(t, err, "failed to generate thumbnail", err) + + return len(thumbnailBytes) +} + //nolint func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath string, size int64) (string, int) { thumbnail := "upload_thumbnail_test.png" - //nolint - thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) - err := os.WriteFile(thumbnail, thumbnailBytes, os.ModePerm) - require.Nil(t, err, "failed to generate thumbnail", err) + thumbnailSize := generateThumbnail(t, thumbnail) output, err := updateFile(t, configPath, map[string]interface{}{ "allocation": allocationID, @@ -376,7 +382,7 @@ func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath s require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) require.Equal(t, "Status completed callback. Type = application/octet-stream. Name = "+filepath.Base(localpath), output[1]) - return thumbnail, len(thumbnailBytes) + return thumbnail, thumbnailSize } func updateFileWithThumbnailURL(t *testing.T, thumbnailURL, allocationID, remotePath, localpath string, size int64) string { From 45d90865e4b709e210d981e81740ee5915a4e824 Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 23:47:05 +0800 Subject: [PATCH 10/22] fix(thumbnail):moved out update_thumbnail_of_upload_file from flaky --- .../flaky___broken_scenarios_test.go | 50 ----------------- tests/cli_tests/zboxcli_download_test.go | 2 +- tests/cli_tests/zboxcli_file_update_test.go | 54 +++++++++++++++++++ 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/tests/cli_tests/flaky___broken_scenarios_test.go b/tests/cli_tests/flaky___broken_scenarios_test.go index c1e2c358e2..40a7265ae0 100644 --- a/tests/cli_tests/flaky___broken_scenarios_test.go +++ b/tests/cli_tests/flaky___broken_scenarios_test.go @@ -2,7 +2,6 @@ package cli_tests import ( - "encoding/base64" "encoding/json" "fmt" "os" @@ -528,55 +527,6 @@ func Test___FlakyBrokenScenarios(t *testing.T) { require.InEpsilon(t, totalChangeInWritePool, intToZCN(challengePool.Balance), epsilon, "expected challenge pool balance to match deducted amount from write pool [%v] but balance was actually [%v]", totalChangeInWritePool, intToZCN(challengePool.Balance)) }) - t.Run("update thumbnail of uploaded file", func(t *testing.T) { - t.Parallel() - - // this sets allocation of 10MB and locks 0.5 ZCN. Default allocation has 2 data shards and 2 parity shards - allocationID := setupAllocationAndReadLock(t, configPath, map[string]interface{}{ - "size": 10 * MB, - "tokens": 2, - }) - - filesize := int64(0.5 * MB) - remotepath := "/" - thumbnail := "upload_thumbnail_test.png" - //nolint - thumbnailBytes, _ := base64.StdEncoding.DecodeString(`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`) - - err := os.WriteFile(thumbnail, thumbnailBytes, os.ModePerm) - require.Nil(t, err, "failed to generate thumbnail", err) - localFilePath := generateFileAndUploadWithParam(t, allocationID, remotepath, filesize, map[string]interface{}{"thumbnailpath": thumbnail}) - - output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ - "allocation": allocationID, - "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": "tmp/", - "thumbnail": true, - }), false) - require.NotNil(t, err, strings.Join(output, "\n")) - require.Len(t, output, 2) - - err = os.Remove(thumbnail) - require.Nil(t, err) - - // Update with new thumbnail - thumbnail = updateFileWithThumbnailURL(t, "https://icons-for-free.com/iconfiles/png/512/eps+file+format+png+file+icon-1320167140989998942.png", allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) - - output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ - "allocation": allocationID, - "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": "tmp/", - "thumbnail": true, - }), false) - require.NotNil(t, err, strings.Join(output, "\n")) - require.Len(t, output, 2) - - err = os.Remove(thumbnail) - require.Nil(t, err) - - createAllocationTestTeardown(t, allocationID) - }) - t.Run("update blobber read price should work", func(t *testing.T) { if testing.Short() { t.Skip("update blobber read price not working.") diff --git a/tests/cli_tests/zboxcli_download_test.go b/tests/cli_tests/zboxcli_download_test.go index b949e93436..6a2b599d97 100644 --- a/tests/cli_tests/zboxcli_download_test.go +++ b/tests/cli_tests/zboxcli_download_test.go @@ -564,7 +564,7 @@ func TestDownload(t *testing.T) { err = os.Remove(filename) require.Nil(t, err) - localPath := "tmp/" + filepath.Base(filename) + localPath := filepath.Join(os.TempDir(), +filepath.Base(filename)) output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 99ddb59cfb..360c871829 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -55,6 +55,60 @@ func TestFileUpdate(t *testing.T) { createAllocationTestTeardown(t, allocationID) }) + t.Run("update thumbnail of uploaded file", func(t *testing.T) { + t.Parallel() + + // this sets allocation of 10MB and locks 0.5 ZCN. Default allocation has 2 data shards and 2 parity shards + allocationID := setupAllocationAndReadLock(t, configPath, map[string]interface{}{ + "size": 10 * MB, + "tokens": 2, + }) + + filesize := int64(0.5 * MB) + remotepath := "/" + thumbnail := "upload_thumbnail_test.png" + //nolint + + generateThumbnail(t, thumbnail) + + localFilePath := generateFileAndUploadWithParam(t, allocationID, remotepath, filesize, map[string]interface{}{"thumbnailpath": thumbnail}) + + output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ + "allocation": allocationID, + "remotepath": remotepath + filepath.Base(localFilePath), + "localpath": "tmp/", + "thumbnail": true, + }), false) + require.Nil(t, err, strings.Join(output, "\n")) + require.Len(t, output, 2) + + err = os.Remove(thumbnail) + require.Nil(t, err) + + // Update with new thumbnail + thumbnail, thumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) + + localPath := filepath.Join(os.TempDir(), thumbnail) + + output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ + "allocation": allocationID, + "remotepath": remotepath + filepath.Base(localFilePath), + "localpath": localPath, + "thumbnail": true, + }), false) + require.NotNil(t, err, strings.Join(output, "\n")) + require.Len(t, output, 2) + + stat, err := os.Stat(localPath) + require.Nil(t, err) + require.Equal(t, thumbnailSize, int(stat.Size())) + + err = os.Remove(thumbnail) + require.Nil(t, err) + + createAllocationTestTeardown(t, allocationID) + }) + t.Run("update with another file of same size should work", func(t *testing.T) { t.Parallel() From 1c4e35869bbe945bced83552a52e9d8046d3b444 Mon Sep 17 00:00:00 2001 From: Lz Date: Wed, 26 Jan 2022 23:50:32 +0800 Subject: [PATCH 11/22] fix(thumbnail):removed unused code --- tests/cli_tests/zboxcli_download_test.go | 2 +- tests/cli_tests/zboxcli_file_update_test.go | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/tests/cli_tests/zboxcli_download_test.go b/tests/cli_tests/zboxcli_download_test.go index 6a2b599d97..5b67f1882f 100644 --- a/tests/cli_tests/zboxcli_download_test.go +++ b/tests/cli_tests/zboxcli_download_test.go @@ -564,7 +564,7 @@ func TestDownload(t *testing.T) { err = os.Remove(filename) require.Nil(t, err) - localPath := filepath.Join(os.TempDir(), +filepath.Base(filename)) + localPath := filepath.Join(os.TempDir(), filepath.Base(filename)) output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 360c871829..cb2484ab4b 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -11,7 +11,6 @@ import ( "testing" climodel "github.com/0chain/system_test/internal/cli/model" - cliutils "github.com/0chain/system_test/internal/cli/util" "github.com/stretchr/testify/require" ) @@ -439,23 +438,6 @@ func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath s return thumbnail, thumbnailSize } -func updateFileWithThumbnailURL(t *testing.T, thumbnailURL, allocationID, remotePath, localpath string, size int64) string { - thumbnail := "upload_thumbnail_test.png" - output, err := cliutils.RunCommandWithoutRetry(fmt.Sprintf("wget %s -O %s", thumbnailURL, thumbnail)) - require.Nil(t, err, "Failed to download thumbnail png file: ", strings.Join(output, "\n")) - - output, err = updateFile(t, configPath, map[string]interface{}{ - "allocation": allocationID, - "remotepath": remotePath, - "localpath": localpath, - "thumbnailpath": thumbnail, - }, true) - require.Nil(t, err, strings.Join(output, "\n")) - require.Len(t, output, 2) - require.Equal(t, "Status completed callback. Type = application/octet-stream. Name = "+filepath.Base(localpath), output[1]) - return thumbnail -} - func updateFileWithCommit(t *testing.T, allocationID, remotePath, localpath string) { output, err := updateFile(t, configPath, map[string]interface{}{ "allocation": allocationID, From 472273b963208712a5ebcdcf72334f7c17737fd0 Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 09:24:18 +0800 Subject: [PATCH 12/22] fix(thumbnail):removed tmp files --- tests/cli_tests/zboxcli_file_update_test.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index cb2484ab4b..9f43adfc99 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -69,6 +69,10 @@ func TestFileUpdate(t *testing.T) { //nolint generateThumbnail(t, thumbnail) + defer func() { + //nolint: errcheck + os.Remove(thumbnail) + }() localFilePath := generateFileAndUploadWithParam(t, allocationID, remotepath, filesize, map[string]interface{}{"thumbnailpath": thumbnail}) @@ -81,9 +85,6 @@ func TestFileUpdate(t *testing.T) { require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) - err = os.Remove(thumbnail) - require.Nil(t, err) - // Update with new thumbnail thumbnail, thumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) @@ -102,8 +103,10 @@ func TestFileUpdate(t *testing.T) { require.Nil(t, err) require.Equal(t, thumbnailSize, int(stat.Size())) - err = os.Remove(thumbnail) - require.Nil(t, err) + defer func() { + //nolint: errcheck + os.Remove(localPath) + }() createAllocationTestTeardown(t, allocationID) }) From af8d873feac5120f54781c7a57a05f2e4cc0c5a7 Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 10:03:51 +0800 Subject: [PATCH 13/22] fix(thumbnail):removed tmp files --- tests/cli_tests/zboxcli_file_update_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 9f43adfc99..6c59fe39c7 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -84,28 +84,31 @@ func TestFileUpdate(t *testing.T) { }), false) require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) + defer func() { + os.Remove(localFilePath) + }() // Update with new thumbnail thumbnail, thumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) - localPath := filepath.Join(os.TempDir(), thumbnail) + localThumbnailPath := filepath.Join(os.TempDir(), thumbnail) output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": localPath, + "localpath": localThumbnailPath, "thumbnail": true, }), false) require.NotNil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) - stat, err := os.Stat(localPath) + stat, err := os.Stat(localThumbnailPath) require.Nil(t, err) require.Equal(t, thumbnailSize, int(stat.Size())) defer func() { //nolint: errcheck - os.Remove(localPath) + os.Remove(localThumbnailPath) }() createAllocationTestTeardown(t, allocationID) From e190d4169ecefb3dbbedf309a447381608e3133f Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 10:04:55 +0800 Subject: [PATCH 14/22] fix(thumbnail):removed tmp files --- tests/cli_tests/zboxcli_file_update_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 6c59fe39c7..c507a434d5 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -96,7 +96,7 @@ func TestFileUpdate(t *testing.T) { output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": localThumbnailPath, + "localpath": os.TempDir(), "thumbnail": true, }), false) require.NotNil(t, err, strings.Join(output, "\n")) From 33c47c7123e688befebbf6d1996b324b9731aefc Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 10:09:07 +0800 Subject: [PATCH 15/22] fix(thumbnail):removed tmp files --- tests/cli_tests/zboxcli_file_update_test.go | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index c507a434d5..883a672ebe 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -79,19 +79,29 @@ func TestFileUpdate(t *testing.T) { output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": "tmp/", + "localpath": os.TempDir(), "thumbnail": true, }), false) require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) defer func() { + //nolint: errcheck os.Remove(localFilePath) + //nolint: errcheck + os.Remove(filepath.Join(os.TempDir(), filepath.Base(localFilePath))) }() // Update with new thumbnail - thumbnail, thumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) + newThumbnail, newThumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) - localThumbnailPath := filepath.Join(os.TempDir(), thumbnail) + localThumbnailPath := filepath.Join(os.TempDir(), newThumbnail) + + defer func() { + //nolint: errcheck + os.Remove(localThumbnailPath) + //nolint: errcheck + os.Remove(newThumbnail) + }() output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, @@ -104,12 +114,7 @@ func TestFileUpdate(t *testing.T) { stat, err := os.Stat(localThumbnailPath) require.Nil(t, err) - require.Equal(t, thumbnailSize, int(stat.Size())) - - defer func() { - //nolint: errcheck - os.Remove(localThumbnailPath) - }() + require.Equal(t, newThumbnailSize, int(stat.Size())) createAllocationTestTeardown(t, allocationID) }) From b6c12ec93b15952d0ab7a5fdb67bb37cadd17346 Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 13:20:17 +0800 Subject: [PATCH 16/22] fix(thumbnail):removed tmp files --- tests/cli_tests/zboxcli_file_update_test.go | 36 +++++++++------------ 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index 883a672ebe..a9721da87c 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -67,46 +67,37 @@ func TestFileUpdate(t *testing.T) { remotepath := "/" thumbnail := "upload_thumbnail_test.png" //nolint - generateThumbnail(t, thumbnail) - defer func() { - //nolint: errcheck - os.Remove(thumbnail) - }() localFilePath := generateFileAndUploadWithParam(t, allocationID, remotepath, filesize, map[string]interface{}{"thumbnailpath": thumbnail}) + //nolint: errcheck + os.Remove(thumbnail) + //nolint: errcheck + os.Remove(localFilePath) output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": os.TempDir(), + "localpath": localFilePath, "thumbnail": true, }), false) require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) - defer func() { - //nolint: errcheck - os.Remove(localFilePath) - //nolint: errcheck - os.Remove(filepath.Join(os.TempDir(), filepath.Base(localFilePath))) - }() + + //nolint: errcheck + os.Remove(localFilePath) // Update with new thumbnail newThumbnail, newThumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) + //nolint: errcheck + os.Remove(newThumbnail) - localThumbnailPath := filepath.Join(os.TempDir(), newThumbnail) - - defer func() { - //nolint: errcheck - os.Remove(localThumbnailPath) - //nolint: errcheck - os.Remove(newThumbnail) - }() + localThumbnailPath := filepath.Join(os.TempDir(), filepath.Base(newThumbnail)) output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": os.TempDir(), + "localpath": localThumbnailPath, "thumbnail": true, }), false) require.NotNil(t, err, strings.Join(output, "\n")) @@ -116,6 +107,9 @@ func TestFileUpdate(t *testing.T) { require.Nil(t, err) require.Equal(t, newThumbnailSize, int(stat.Size())) + //nolint: errcheck + os.Remove(localThumbnailPath) + createAllocationTestTeardown(t, allocationID) }) From 54af5a9c38219e01260b1a6b23459b019625b3d5 Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 13:33:13 +0800 Subject: [PATCH 17/22] fix(thumbnail):removed tmp files before downloading --- tests/cli_tests/zboxcli_file_update_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index a9721da87c..a59597bbae 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -84,13 +84,12 @@ func TestFileUpdate(t *testing.T) { require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) - //nolint: errcheck - os.Remove(localFilePath) - // Update with new thumbnail newThumbnail, newThumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) //nolint: errcheck os.Remove(newThumbnail) + //nolint: errcheck + os.Remove(localFilePath) localThumbnailPath := filepath.Join(os.TempDir(), filepath.Base(newThumbnail)) From e9e90fc38b5a733136807f81b3cd94929b6b036c Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 20:59:27 +0800 Subject: [PATCH 18/22] fix(update): fixed thumbnal path issue --- tests/cli_tests/zboxcli_file_update_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index a59597bbae..c657b21d2e 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -32,10 +32,13 @@ func TestFileUpdate(t *testing.T) { thumbnailFile, thumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) + //nolint: errcheck + os.Remove(thumbnailFile) + output, err := downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remotepath + filepath.Base(localFilePath), - "localpath": "tmp/", + "localpath": thumbnailFile, "thumbnail": true, }), false) @@ -46,11 +49,6 @@ func TestFileUpdate(t *testing.T) { require.Nil(t, err, strings.Join(output, "\n")) require.Equal(t, thumbnailSize, int(stats.Size())) - defer func() { - // Delete the downloaded thumbnail file - err = os.Remove(thumbnailFile) - require.Nil(t, err) - }() createAllocationTestTeardown(t, allocationID) }) @@ -413,6 +411,7 @@ func TestFileUpdate(t *testing.T) { createAllocationTestTeardown(t, allocationID) }) + } func generateThumbnail(t *testing.T, localpath string) int { From 88bf63bccce464ee486501ca17158ff7a4d05d2a Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 21:28:13 +0800 Subject: [PATCH 19/22] fix(update): fixed status assertion --- tests/cli_tests/zboxcli_file_update_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index c657b21d2e..a398507c6d 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -437,7 +437,7 @@ func updateFileWithThumbnail(t *testing.T, allocationID, remotePath, localpath s }, true) require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) - require.Equal(t, "Status completed callback. Type = application/octet-stream. Name = "+filepath.Base(localpath), output[1]) + require.True(t, strings.HasPrefix(output[1], "Status completed callback.") && strings.HasSuffix(output[1], "Name = "+filepath.Base(localpath))) return thumbnail, thumbnailSize } From ca40f0064702ce8c5d1bfadd812034d34e346f2c Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 21:42:00 +0800 Subject: [PATCH 20/22] fix(update): removed tmp files --- tests/cli_tests/zboxcli_file_update_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index a398507c6d..f309f5ecfb 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -84,12 +84,14 @@ func TestFileUpdate(t *testing.T) { // Update with new thumbnail newThumbnail, newThumbnailSize := updateFileWithThumbnail(t, allocationID, "/"+filepath.Base(localFilePath), localFilePath, int64(filesize)) + + localThumbnailPath := filepath.Join(os.TempDir(), filepath.Base(newThumbnail)) //nolint: errcheck os.Remove(newThumbnail) //nolint: errcheck os.Remove(localFilePath) - - localThumbnailPath := filepath.Join(os.TempDir(), filepath.Base(newThumbnail)) + //nolint: errcheck + os.Remove(localThumbnailPath) output, err = downloadFile(t, configPath, createParams(map[string]interface{}{ "allocation": allocationID, From 1e6865a2e48adc7e7a387b107962ff1ce30bdd13 Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 22:24:33 +0800 Subject: [PATCH 21/22] fix(update): fixed result assertion --- tests/cli_tests/zboxcli_file_delete_test.go | 5 +++-- tests/cli_tests/zboxcli_file_update_test.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_delete_test.go b/tests/cli_tests/zboxcli_file_delete_test.go index 4342556abb..6f6aa13fd1 100644 --- a/tests/cli_tests/zboxcli_file_delete_test.go +++ b/tests/cli_tests/zboxcli_file_delete_test.go @@ -226,12 +226,12 @@ func TestFileDelete(t *testing.T) { require.Len(t, output, 2) fname := filepath.Base(filename) - remoteFilePath := path.Join(remotepath, fname) + remoteFilePath := filepath.Join(remotepath, fname) output, err = deleteFile(t, escapedTestName(t), createParams(map[string]interface{}{ "allocation": allocationID, "remotepath": remoteFilePath, - }), true) + }), false) require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 1) require.Equal(t, fmt.Sprintf("%s deleted", remoteFilePath), output[0]) @@ -436,4 +436,5 @@ func TestFileDelete(t *testing.T) { require.Len(t, output, 1) require.Contains(t, output[0], remotepath, strings.Join(output, "\n")) }) + } diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index f309f5ecfb..a88ebdd514 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -99,7 +99,7 @@ func TestFileUpdate(t *testing.T) { "localpath": localThumbnailPath, "thumbnail": true, }), false) - require.NotNil(t, err, strings.Join(output, "\n")) + require.Nil(t, err, strings.Join(output, "\n")) require.Len(t, output, 2) stat, err := os.Stat(localThumbnailPath) From bc21575fa5b9c6049b3c5fdc288c7a8af718e14d Mon Sep 17 00:00:00 2001 From: Lz Date: Thu, 27 Jan 2022 23:21:24 +0800 Subject: [PATCH 22/22] fix(update): fixed lint issues --- tests/cli_tests/zboxcli_file_delete_test.go | 1 - tests/cli_tests/zboxcli_file_update_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/cli_tests/zboxcli_file_delete_test.go b/tests/cli_tests/zboxcli_file_delete_test.go index 6f6aa13fd1..5c022dbfaa 100644 --- a/tests/cli_tests/zboxcli_file_delete_test.go +++ b/tests/cli_tests/zboxcli_file_delete_test.go @@ -436,5 +436,4 @@ func TestFileDelete(t *testing.T) { require.Len(t, output, 1) require.Contains(t, output[0], remotepath, strings.Join(output, "\n")) }) - } diff --git a/tests/cli_tests/zboxcli_file_update_test.go b/tests/cli_tests/zboxcli_file_update_test.go index a88ebdd514..1b5b4ae0b5 100644 --- a/tests/cli_tests/zboxcli_file_update_test.go +++ b/tests/cli_tests/zboxcli_file_update_test.go @@ -413,7 +413,6 @@ func TestFileUpdate(t *testing.T) { createAllocationTestTeardown(t, allocationID) }) - } func generateThumbnail(t *testing.T, localpath string) int {