diff options
| author | karthik nayak <knayak@gitlab.com> | 2023-08-22 13:09:59 +0300 |
|---|---|---|
| committer | karthik nayak <knayak@gitlab.com> | 2023-08-22 13:09:59 +0300 |
| commit | 87dc7898d15ee104c4a3285ae84f177f25918871 (patch) | |
| tree | 9c178ea3969b9cc2dff48113f4697e0fce6d9083 | |
| parent | 548364de5404ed0be6b36416fc7ba4a49a236819 (diff) | |
| parent | 71b3f787c4cab1a4101e505c448d8a8fa46686ae (diff) | |
Merge branch 'smh-fix-reconciler-flake' into 'master'
Fix flaky reconciler test
Closes #5128
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6261
Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
| -rw-r--r-- | internal/praefect/reconciler/reconciler_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go index 4cfcc3a80..672dd42e7 100644 --- a/internal/praefect/reconciler/reconciler_test.go +++ b/internal/praefect/reconciler/reconciler_test.go @@ -1156,7 +1156,7 @@ func TestReconciler(t *testing.T) { // Sort the jobs so the require.Contains works below, the order of the produced jobs is not important. for _, jobs := range append(expectedJobs, actualJobs) { sort.Slice(jobs, func(i, j int) bool { - return jobs[i].VirtualStorage+jobs[i].RelativePath < jobs[j].VirtualStorage+jobs[j].RelativePath + return jobs[i].VirtualStorage+jobs[i].RelativePath+jobs[i].TargetNodeStorage < jobs[j].VirtualStorage+jobs[j].RelativePath+jobs[j].TargetNodeStorage }) } |