Merge pull request #122 from jmr/deflake

Deflake tests

Author: rsned

s2/cell_test.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"math/rand"
 	"testing"
 	"unsafe"
 
@@ -484,6 +485,10 @@ func TestCellContainsPoint(t *testing.T) {
 }
 
 func TestCellContainsPointConsistentWithS2CellIDFromPoint(t *testing.T) {
+	// About 1% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(1)
+
 	// Construct many points that are nearly on a Cell edge, and verify that
 	// CellFromCellID(cellIDFromPoint(p)).Contains(p) is always true.
 	for iter := 0; iter < 1000; iter++ {
@@ -653,6 +658,10 @@ func maxDistanceToEdgeBruteForce(cell Cell, a, b Point) s1.ChordAngle {
 }
 
 func TestCellDistanceToEdge(t *testing.T) {
+	// About 0.1% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(2)
+
 	for iter := 0; iter < 1000; iter++ {
 		cell := CellFromCellID(randomCellID())
 

s2/cellunion_test.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"math/rand"
 	"reflect"
 	"testing"
 
@@ -370,6 +371,10 @@ func addCells(id CellID, selected bool, input *[]CellID, expected *[]CellID, t *
 }
 
 func TestCellUnionNormalizePseudoRandom(t *testing.T) {
+	// About 2.4% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(2)
+
 	// Try a bunch of random test cases, and keep track of average statistics
 	// for normalization (to see if they agree with the analysis above).
 

s2/convex_hull_query_test.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"math/rand"
 	"testing"
 
 	"github.com/golang/geo/s1"
@@ -193,6 +194,10 @@ func TestConvexHullQueryLoopsAroundNorthPole(t *testing.T) {
 }
 
 func TestConvexHullQueryPointsInsideHull(t *testing.T) {
+	// About 0.3% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(1)
+
 	// Repeatedly build the convex hull of a set of points, then add more points
 	// inside that loop and build the convex hull again. The result should
 	// always be the same.

s2/edge_clipping_test.go

@@ -17,6 +17,7 @@ package s2
 import (
 	"fmt"
 	"math"
+	"math/rand"
 	"testing"
 
 	"github.com/golang/geo/r1"
@@ -247,6 +248,10 @@ func testClipToPaddedFace(t *testing.T, a, b Point) {
 }
 
 func TestEdgeClippingClipToPaddedFace(t *testing.T) {
+	// About 1.2% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(1)
+
 	// Start with a few simple cases.
 	// An edge that is entirely contained within one cube face:
 	testClipToPaddedFace(t, Point{r3.Vector{X: 1, Y: -0.5, Z: -0.5}}, Point{r3.Vector{X: 1, Y: 0.5, Z: 0.5}})

s2/paddedcell_test.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"math/rand"
 	"testing"
 
 	"github.com/golang/geo/r1"
@@ -132,6 +133,10 @@ func TestPaddedCellEntryExitVertices(t *testing.T) {
 }
 
 func TestPaddedCellShrinkToFit(t *testing.T) {
+	// About 0.2% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(1)
+
 	for iter := 0; iter < 1000; iter++ {
 		// Start with the desired result and work backwards.
 		result := randomCellID()

s2/point_test.go

@@ -16,6 +16,7 @@ package s2
 
 import (
 	"math"
+	"math/rand"
 	"testing"
 
 	"github.com/golang/geo/r3"
@@ -94,6 +95,10 @@ func TestPointDistance(t *testing.T) {
 }
 
 func TestChordAngleBetweenPoints(t *testing.T) {
+	// About 0.2% flaky with a random seed.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(1)
+
 	for iter := 0; iter < 10; iter++ {
 		m := randomFrame()
 		x := m.col(0)

s2/s2_test_test.go

@@ -17,6 +17,7 @@ package s2
 import (
 	"fmt"
 	"math"
+	"math/rand"
 	"testing"
 
 	"github.com/golang/geo/s1"
@@ -50,6 +51,10 @@ func numVerticesAtLevel(level int) int {
 }
 
 func TestTestingFractal(t *testing.T) {
+	// About 2.4% flaky with a random seed, due to CesaroMultiFractal.
+	// TODO: https://github.com/golang/geo/issues/120
+	rand.Seed(1)
+
 	tests := []struct {
 		label     string
 		minLevel  int