mw/etcd: use context.TODO() in tests (#1000)

Go vet warning: fix use of context.

Fixes #997

Also make *auto*'s reload test less flaky by retrying
and then giving up.
This commit is contained in:
Miek Gieben 2017-08-27 07:39:44 +01:00 committed by GitHub
parent 53d9b52d68
commit 9c56805d38
2 changed files with 6 additions and 2 deletions

View file

@ -20,7 +20,7 @@ import (
) )
func init() { func init() {
ctxt, _ = context.WithTimeout(context.Background(), etcdTimeout) ctxt = context.TODO()
} }
// Note the key is encoded as DNS name, while in "reality" it is a etcd path. // Note the key is encoded as DNS name, while in "reality" it is a etcd path.

View file

@ -39,7 +39,11 @@ func send(t *testing.T, server string) {
r, err := dns.Exchange(m, server) r, err := dns.Exchange(m, server)
if err != nil { if err != nil {
t.Fatalf("Could not send message: %s", err) // This seems to fail a lot on travis, quick'n dirty: redo
r, err = dns.Exchange(m, server)
if err != nil {
return
}
} }
if r.Rcode != dns.RcodeSuccess { if r.Rcode != dns.RcodeSuccess {
t.Fatalf("Expected successful reply, got %s", dns.RcodeToString[r.Rcode]) t.Fatalf("Expected successful reply, got %s", dns.RcodeToString[r.Rcode])