Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make NewTmpBackend use testing tmp location (so cleanup).

Browse Source
This commit is contained in:
Piotr Tabor
2021-03-26 13:19:49 +01:00
parent 8ee1dd9e23
commit 03f55eeb2c
18 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/lease/leasehttp/http_test.go
View File

@@ -29,7 +29,7 @@ import (
func TestRenewHTTP(t *testing.T) {
lg := zap.NewNop()
be, tmpPath := backend.NewTmpBackend(time.Hour, 10000)
be, tmpPath := backend.NewTmpBackend(t, time.Hour, 10000)
defer os.Remove(tmpPath)
defer be.Close()
@@ -54,7 +54,7 @@ func TestRenewHTTP(t *testing.T) {
func TestTimeToLiveHTTP(t *testing.T) {
lg := zap.NewNop()
be, tmpPath := backend.NewTmpBackend(time.Hour, 10000)
be, tmpPath := backend.NewTmpBackend(t, time.Hour, 10000)
defer os.Remove(tmpPath)
defer be.Close()
@@ -96,7 +96,7 @@ func TestTimeToLiveHTTPTimeout(t *testing.T) {
func testApplyTimeout(t *testing.T, f func(*lease.Lease, string) error) {
lg := zap.NewNop()
be, tmpPath := backend.NewTmpBackend(time.Hour, 10000)
be, tmpPath := backend.NewTmpBackend(t, time.Hour, 10000)
defer os.Remove(tmpPath)
defer be.Close()

14
server/lease/lessor_bench_test.go
View File

@@ -16,7 +16,6 @@ package lease
import (
"math/rand"
"os"
"testing"
"time"
@@ -64,9 +63,9 @@ func demote(le *lessor) {
}
// return new lessor and tearDown to release resource
func setUp() (le *lessor, tearDown func()) {
func setUp(t testing.TB) (le *lessor, tearDown func()) {
lg := zap.NewNop()
be, tmpPath := backend.NewDefaultTmpBackend()
be, _ := backend.NewDefaultTmpBackend(t)
// MinLeaseTTL is negative, so we can grant expired lease in benchmark.
// ExpiredLeasesRetryInterval should small, so benchmark of findExpired will recheck expired lease.
le = newLessor(lg, be, LessorConfig{MinLeaseTTL: -1000, ExpiredLeasesRetryInterval: 10 * time.Microsecond}, nil)
@@ -80,7 +79,6 @@ func setUp() (le *lessor, tearDown func()) {
return le, func() {
le.Stop()
be.Close()
os.Remove(tmpPath)
}
}
@@ -97,7 +95,7 @@ func benchmarkLessorGrant(benchSize int, b *testing.B) {
tearDown()
tearDown = nil
}
le, tearDown = setUp()
le, tearDown = setUp(b)
b.StartTimer()
for j := 1; j <= benchSize; j++ {
@@ -124,7 +122,7 @@ func benchmarkLessorRevoke(benchSize int, b *testing.B) {
tearDown()
tearDown = nil
}
le, tearDown = setUp()
le, tearDown = setUp(b)
for j := 1; j <= benchSize; j++ {
le.Grant(LeaseID(j), ttls[j-1])
}
@@ -155,7 +153,7 @@ func benchmarkLessorRenew(benchSize int, b *testing.B) {
tearDown()
tearDown = nil
}
le, tearDown = setUp()
le, tearDown = setUp(b)
for j := 1; j <= benchSize; j++ {
le.Grant(LeaseID(j), ttls[j-1])
}
@@ -188,7 +186,7 @@ func benchmarkLessorFindExpired(benchSize int, b *testing.B) {
tearDown()
tearDown = nil
}
le, tearDown = setUp()
le, tearDown = setUp(b)
for j := 1; j <= benchSize; j++ {
le.Grant(LeaseID(j), ttls[j-1])
}