Merge branch 'master' into remove_duplicate_values

dzyp · dzyp · commit 7e6c0ef4ca75 · 2015-12-16T08:22:47.000-06:00
diff --git a/batcher/batcher_test.go b/batcher/batcher_test.go
@@ -84,7 +84,7 @@ func TestMaxTime(t *testing.T) {
 
 	// This delta is normally 1-3 ms but running tests in CI with -race causes
 	// this to run much slower. For now, just bump up the threshold.
-	assert.InDelta(200, time.Since(before).Seconds()*1000, 50)
+	assert.InDelta(200, time.Since(before).Seconds()*1000, 100)
 	assert.True(len(batch) > 0)
 	assert.Nil(err)
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func TestMaxTime(t *testing.T) {`
`84`	`84`
`85`	`85`	`// This delta is normally 1-3 ms but running tests in CI with -race causes`
`86`	`86`	`// this to run much slower. For now, just bump up the threshold.`
`87`		`- assert.InDelta(200, time.Since(before).Seconds()*1000, 50)`
	`87`	`+ assert.InDelta(200, time.Since(before).Seconds()*1000, 100)`
`88`	`88`	`assert.True(len(batch) > 0)`
`89`	`89`	`assert.Nil(err)`
`90`	`90`	`}`