diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-02-17 00:41:28 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-02-17 00:41:28 +0300 |
| commit | 3841b8df341e41b3ed7e70306c910792823508bf (patch) | |
| tree | 86e5d454f55f05a9e5fc5f1d967ea5b95e473b73 | |
| parent | 7910fc0e132402d3ab22cef73924aef360598f35 (diff) | |
| parent | 5df4f36abed9e976a9a3bca21fdf2d0c60d284ba (diff) | |
Merge branch 'pks-git-stats-fix-racy-clone-test' into 'master'
git/stats: Fix race when verifying clone timings
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5401
Merged-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/git/stats/http_clone_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/git/stats/http_clone_test.go b/internal/git/stats/http_clone_test.go index 11a7f768d..ea580f826 100644 --- a/internal/git/stats/http_clone_test.go +++ b/internal/git/stats/http_clone_test.go @@ -46,7 +46,7 @@ func TestClone(t *testing.T) { {"time to first packet", clone.ReferenceDiscovery.FirstGitPacket()}, {"time to receive response body", clone.ReferenceDiscovery.ResponseBody()}, } { - require.True(t, m.value > previousValue, "get: expect %s (%v) to be greater than previous value %v", m.desc, m.value, previousValue) + require.GreaterOrEqual(t, m.value, previousValue, "get: expect %s (%v) to be greater than previous value %v", m.desc, m.value, previousValue) previousValue = m.value } @@ -70,7 +70,7 @@ func TestClone(t *testing.T) { {"time to receive first pack message", clone.FetchPack.BandFirstPacket("pack")}, {"time to receive response body", clone.FetchPack.ResponseBody()}, } { - require.True(t, m.value > previousValue, "post: expect %s (%v) to be greater than previous value %v", m.desc, m.value, previousValue) + require.GreaterOrEqual(t, m.value, previousValue, "post: expect %s (%v) to be greater than previous value %v", m.desc, m.value, previousValue) previousValue = m.value } } |