From 15ce0ae57cf52990e10fdb62a6303a9023db7e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Tue, 16 Oct 2018 11:49:32 +0200 Subject: [PATCH] fstests: fix maximum tested size in TestFsPutChunked Before this it was possible hat maxChunkSize was incorrectly set to 200. --- fstest/fstests/fstests.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fstest/fstests/fstests.go b/fstest/fstests/fstests.go index fcd4473f9..d4a2b8a78 100644 --- a/fstest/fstests/fstests.go +++ b/fstest/fstests/fstests.go @@ -540,16 +540,13 @@ func Run(t *testing.T, opt *Opt) { minChunkSize = opt.ChunkedUpload.CeilChunkSize(minChunkSize) } - maxChunkSize := opt.ChunkedUpload.MaxChunkSize - if maxChunkSize < minChunkSize { - if minChunkSize <= fs.MebiByte { - maxChunkSize = 2 * fs.MebiByte - } else { - maxChunkSize = 2 * minChunkSize - } - } else if maxChunkSize >= 2*minChunkSize { + maxChunkSize := 2 * fs.MebiByte + if maxChunkSize < 2*minChunkSize { maxChunkSize = 2 * minChunkSize } + if opt.ChunkedUpload.MaxChunkSize > 0 && maxChunkSize > opt.ChunkedUpload.MaxChunkSize { + maxChunkSize = opt.ChunkedUpload.MaxChunkSize + } if opt.ChunkedUpload.CeilChunkSize != nil { maxChunkSize = opt.ChunkedUpload.CeilChunkSize(maxChunkSize) }