Merge branch 'upstream-mirror' into sync-updates

# Conflicts: # layeredcache_test.go
2021-03-18 20:27:43 -07:00
parent b2a868314a df2d98315c
commit 6453d332ba
8 changed files with 31 additions and 4 deletions
--- a/layeredcache_test.go
+++ b/layeredcache_test.go
@@ -235,6 +235,8 @@ func (_ LayeredCacheTests) ResizeOnTheFly() {
 	for i := 0; i < 5; i++ {
 		cache.Set(strconv.Itoa(i), "a", i, time.Minute)
 	}
+	cache.SyncUpdates()
+
 	cache.SetMaxSize(3)
 	cache.SyncUpdates()
 	Expect(cache.GetDropped()).To.Equal(2)