luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert "Adds a small sleep to make sure we are in the next GC bucket."

This commit is contained in:
James Phillips 2017-11-08 22:18:37 -08:00 committed by GitHub
parent 4f7946f2a5
commit bfbbfb62ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
agent/consul/state/tombstone_gc_test.go
View File

@ -1,6 +1,7 @@
package state package state
import ( import (
"os"
"testing" "testing"
"time" "time"
) )
@ -23,8 +24,12 @@ func TestTombstoneGC_invalid(t *testing.T) {
} }
func TestTombstoneGC(t *testing.T) { func TestTombstoneGC(t *testing.T) {
ttl := 200 * time.Millisecond if os.Getenv("TRAVIS") == "true" {
gran := 50 * time.Millisecond t.Skip("GC test is flaky on travis-ci (see #3670)")
}
ttl := 20 * time.Millisecond
gran := 5 * time.Millisecond
gc, err := NewTombstoneGC(ttl, gran) gc, err := NewTombstoneGC(ttl, gran)
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
@ -56,12 +61,6 @@ func TestTombstoneGC(t *testing.T) {
t.Fatalf("should get expiration") t.Fatalf("should get expiration")
} }
// At this point we know we are very close to a TTL bucket
// so we sleep a small fraction of the bucket size in order
// to hit the case we desire for the next section where we
// hint twice into the same bucket and see them coalesce.
time.Sleep(gran / 5)
start2 := time.Now() start2 := time.Now()
gc.Hint(120) gc.Hint(120)
gc.Hint(125) gc.Hint(125)