From a6077588b25bcb7b9a78c071371d3fd61cf37f44 Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Wed, 26 Feb 2025 17:54:22 +0800 Subject: [PATCH 1/3] fix TestRemovingProgress Signed-off-by: Ryan Leung --- tests/server/api/api_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/server/api/api_test.go b/tests/server/api/api_test.go index 314329a614e..1f6bbcd08e9 100644 --- a/tests/server/api/api_test.go +++ b/tests/server/api/api_test.go @@ -917,21 +917,23 @@ func TestRemovingProgress(t *testing.T) { return false } // store 1: (60-20)/(60+50) ~= 0.36 - // store 2: (30-10)/(30+40) ~= 0.28 + // store 2: (30-10)/(30+40) ~= 0.28 110-40 70-20 // average progress ~= (0.36+0.28)/2 = 0.32 if fmt.Sprintf("%.2f", p.Progress) != "0.32" { return false } - // store 1: 40/10s = 4 - // store 2: 20/10s = 2 + // store 1: 40/20s = 4 + // store 2: 20/20s = 2 // average speed = (2+4)/2 = 3.0 - if p.CurrentSpeed != 3.0 { + // If checkStore is executed multiple times, the time windows will increase + // which is 20s, 30s, 40s ..., the corresponding speed will be 3.0, 1.5, 1 ... + if p.CurrentSpeed > 3.0 { return false } // store 1: (20+50)/4 = 17.5s // store 2: (10+40)/2 = 25s // average time = (17.5+25)/2 = 21.25s - if p.LeftSeconds != 21.25 { + if p.LeftSeconds < 21.25 { return false } return true From 14ec4bf5fe5e288e6d1af931d06891258118a872 Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Thu, 27 Feb 2025 16:02:31 +0800 Subject: [PATCH 2/3] fix Signed-off-by: Ryan Leung --- tests/server/api/api_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/server/api/api_test.go b/tests/server/api/api_test.go index 1f6bbcd08e9..d8465c19bdf 100644 --- a/tests/server/api/api_test.go +++ b/tests/server/api/api_test.go @@ -917,7 +917,7 @@ func TestRemovingProgress(t *testing.T) { return false } // store 1: (60-20)/(60+50) ~= 0.36 - // store 2: (30-10)/(30+40) ~= 0.28 110-40 70-20 + // store 2: (30-10)/(30+40) ~= 0.28 // average progress ~= (0.36+0.28)/2 = 0.32 if fmt.Sprintf("%.2f", p.Progress) != "0.32" { return false From 19992fc58dff818052b53403a6a3ba7859df2ddf Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Thu, 27 Feb 2025 16:04:47 +0800 Subject: [PATCH 3/3] fix Signed-off-by: Ryan Leung --- tests/server/api/api_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/server/api/api_test.go b/tests/server/api/api_test.go index d8465c19bdf..b057f8eb657 100644 --- a/tests/server/api/api_test.go +++ b/tests/server/api/api_test.go @@ -922,11 +922,11 @@ func TestRemovingProgress(t *testing.T) { if fmt.Sprintf("%.2f", p.Progress) != "0.32" { return false } - // store 1: 40/20s = 4 - // store 2: 20/20s = 2 + // store 1: 40/10s = 4 + // store 2: 20/10s = 2 // average speed = (2+4)/2 = 3.0 // If checkStore is executed multiple times, the time windows will increase - // which is 20s, 30s, 40s ..., the corresponding speed will be 3.0, 1.5, 1 ... + // which is 10s, 20s, 30s ..., the corresponding speed will be 3.0, 1.5, 1 ... if p.CurrentSpeed > 3.0 { return false }