mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

net/dns: add start of Linux newOSConfigurator tests

Browse Source 
Only one test case so far.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-08-30 14:16:12 -07:00
parent 09a47ea3f1
commit 065c4ffc2c
2 changed files with 86 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/dns/manager_linux.go
View File

@ -29,7 +29,6 @@ func (kv kv) String() string {
func NewOSConfigurator(logf logger.Logf, interfaceName string) (ret OSConfigurator, err error) {
return newOSConfigurator(logf, interfaceName, newOSConfigEnv{
fs: directFS{},
ReadFile: os.ReadFile,
resolvOwner: resolvOwner,
resolvedIsActuallyResolver: resolvedIsActuallyResolver,
dbusPing: dbusPing,
@ -42,8 +41,7 @@ func NewOSConfigurator(logf logger.Logf, interfaceName string) (ret OSConfigurat
// newOSConfigEnv are the funcs newOSConfigurator needs, pulled out for testing.
type newOSConfigEnv struct {
fs wholeFileFS
ReadFile func(name string) ([]byte, error)
resolvOwner func(resolvConfContnets []byte) string
resolvOwner func(resolvConfContents []byte) string
resolvedIsActuallyResolver func(wholeFileFS) error
dbusPing func(string, string) error
nmIsUsingResolved func() error
@ -63,7 +61,7 @@ func newOSConfigurator(logf logger.Logf, interfaceName string, env newOSConfigEn
logf("dns: %v", debug)
}()
bs, err := env.ReadFile("/etc/resolv.conf")
bs, err := env.fs.ReadFile(resolvConf)
if os.IsNotExist(err) {
dbg("rc", "missing")
return newDirectManager(), nil