Merge branch v2.11 into v3.4
This commit is contained in:
commit
bd4bfd8919
110 changed files with 493 additions and 494 deletions
|
|
@ -1,7 +1,6 @@
|
|||
package tailscale
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
@ -125,7 +124,7 @@ func TestProvider_findDomains(t *testing.T) {
|
|||
|
||||
p := Provider{ResolverName: "foo"}
|
||||
|
||||
got := p.findDomains(context.TODO(), test.config)
|
||||
got := p.findDomains(t.Context(), test.config)
|
||||
assert.Equal(t, test.want, got)
|
||||
})
|
||||
}
|
||||
|
|
@ -230,7 +229,7 @@ func Test_sanitizeDomains(t *testing.T) {
|
|||
t.Run(test.desc, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
got := sanitizeDomains(context.TODO(), test.domains)
|
||||
got := sanitizeDomains(t.Context(), test.domains)
|
||||
assert.Equal(t, test.want, got)
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue