Merge remote-tracking branch 'upstream/master' into ha_tracker_mixed_replicas

eduardscaueru · eduardscaueru · commit 91e94eccb475 · 2024-11-17T23:03:10.000+02:00
diff --git a/integration/query_fuzz_test.go b/integration/query_fuzz_test.go
@@ -641,7 +641,8 @@ var comparer = cmp.Comparer(func(x, y model.Value) bool {
 	}
 	compareFloats := func(l, r float64) bool {
 		const epsilon = 1e-6
-		return cmp.Equal(l, r, cmpopts.EquateNaNs(), cmpopts.EquateApprox(0, epsilon))
+		const fraction = 1.e-10 // 0.00000001%
+		return cmp.Equal(l, r, cmpopts.EquateNaNs(), cmpopts.EquateApprox(fraction, epsilon))
 	}
 	compareMetrics := func(l, r model.Metric) bool {
 		return l.Equal(r)

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,8 @@ var comparer = cmp.Comparer(func(x, y model.Value) bool {`
`641`	`641`	`}`
`642`	`642`	`compareFloats := func(l, r float64) bool {`
`643`	`643`	`const epsilon = 1e-6`
`644`		`- return cmp.Equal(l, r, cmpopts.EquateNaNs(), cmpopts.EquateApprox(0, epsilon))`
	`644`	`+ const fraction = 1.e-10 // 0.00000001%`
	`645`	`+ return cmp.Equal(l, r, cmpopts.EquateNaNs(), cmpopts.EquateApprox(fraction, epsilon))`
`645`	`646`	`}`
`646`	`647`	`compareMetrics := func(l, r model.Metric) bool {`
`647`	`648`	`return l.Equal(r)`