diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-03-16 19:43:45 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-03-16 19:43:45 +0300 |
| commit | 13831d6322618ae3913485d3aced363b820ba8d8 (patch) | |
| tree | ec207e570c0d07f9791e3e87290bef92680d05d2 | |
| parent | fe7143eb3ae67991313b428854c9041d4696e86b (diff) | |
| parent | 9009925db1b727731e385f55d9b0dad9511fa81d (diff) | |
Merge branch 'pks-git-stats-flaky-http-push-timings' into 'master'
git/stats: Fix flaky timings in HTTP push tests
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5524
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_push_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/git/stats/http_push_test.go b/internal/git/stats/http_push_test.go index e6a74b95a..bcc4c884a 100644 --- a/internal/git/stats/http_push_test.go +++ b/internal/git/stats/http_push_test.go @@ -187,9 +187,10 @@ func TestPerformHTTPPush(t *testing.T) { previousTime := start for _, expectedTiming := range tc.expectedTimings { timing := timings[expectedTiming] - require.True(t, timing.After(previousTime), + require.GreaterOrEqual(t, *timing, previousTime, "expected to receive %q packet before before %q, but received at %q", - expectedTiming, previousTime, timing) + expectedTiming, previousTime, timing, + ) previousTime = *timing *timing = time.Time{} } |