acme/autocert: fix race in test.
The timeNow package variable doesn't work well here: since the renewal
functionality spawns goroutines that invoke timeNow, once a test has
caused such goroutines to exist, another test can't fiddle with it
without the race detector triggering.
Instead, have a private member of Manager that the tests can set if they
need.
Change-Id: Iaf1a68d8efb84c9c5e2804aeb9cc6b2d3f3fef43
Reviewed-on: https://go-review.googlesource.com/128655
Run-TryBot: Adam Langley <agl@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/acme/autocert/renewal_test.go b/acme/autocert/renewal_test.go
index 634305a..5d1c63f 100644
--- a/acme/autocert/renewal_test.go
+++ b/acme/autocert/renewal_test.go
@@ -23,10 +23,10 @@
func TestRenewalNext(t *testing.T) {
now := time.Now()
- timeNow = func() time.Time { return now }
- defer func() { timeNow = time.Now }()
-
- man := &Manager{RenewBefore: 7 * 24 * time.Hour}
+ man := &Manager{
+ RenewBefore: 7 * 24 * time.Hour,
+ nowFunc: func() time.Time { return now },
+ }
defer man.stopRenew()
tt := []struct {
expiry time.Time
@@ -207,7 +207,7 @@
if err != nil {
t.Fatal(err)
}
- newLeaf, err := validCert(exampleCertKey, [][]byte{newCert}, newKey)
+ newLeaf, err := validCert(exampleCertKey, [][]byte{newCert}, newKey, now)
if err != nil {
t.Fatal(err)
}
@@ -225,7 +225,7 @@
if err != nil {
t.Fatal(err)
}
- oldLeaf, err := validCert(exampleCertKey, [][]byte{oldCert}, key)
+ oldLeaf, err := validCert(exampleCertKey, [][]byte{oldCert}, key, now)
if err != nil {
t.Fatal(err)
}
