diff options
| author | Will Chandler <wchandler@gitlab.com> | 2023-09-07 17:14:35 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2023-09-07 17:14:35 +0300 |
| commit | 69b963287fdb69c55ca41864ac5e4ec8b2dc0d63 (patch) | |
| tree | 99cf45be0bd447c3e49c28677c27d7a9be830eb6 | |
| parent | fe315dc30f61195e56f4c0e98724f076dc56dbb7 (diff) | |
| parent | 5c205ddf27ab9b290efa256060940505caa2c201 (diff) | |
Merge branch 'pks-git-stats-fix-flake-due-to-time-comparison' into 'master'
git/stats: Fix flaky test due to time ordering
Closes #5541
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6346
Merged-by: Will Chandler <wchandler@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/git/stats/send_pack_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/git/stats/send_pack_test.go b/internal/git/stats/send_pack_test.go index 5434f4739..7a2b33cb2 100644 --- a/internal/git/stats/send_pack_test.go +++ b/internal/git/stats/send_pack_test.go @@ -37,8 +37,8 @@ func TestSendPack_Parse(t *testing.T) { require.Equal(t, 44, sendPack.largestPacketSize) for _, band := range []string{"pack", "progress"} { - require.True(t, startTime.Before(sendPack.multiband[band].firstPacket)) - require.True(t, endTime.After(sendPack.multiband[band].firstPacket)) + require.LessOrEqual(t, startTime, sendPack.multiband[band].firstPacket) + require.LessOrEqual(t, sendPack.multiband[band].firstPacket, endTime) sendPack.multiband[band].firstPacket = startTime } |