toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace utils.CheckLocalDns with bytes.Contains line

Browse Source 
Since RemoveLocalDns patch will  remove all localhost entries
from resolv.conf we no longer need anything more then
!bytes.Contains(resolvConf, []byte("nameserver")

To check for no nameserver entry in dns config.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: a297d6ab8c08a13503fd004ec1ad7ee9e23bd22a
Component: engine
This commit is contained in:
Dan Walsh
2014-09-24 14:19:55 -04:00
parent b90aac66ac
commit 7c11f5dee8
4 changed files with 4 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
components/engine/utils/utils_test.go
View File

@ -5,35 +5,6 @@ import (
"testing"
)
func TestCheckLocalDns(t *testing.T) {
for resolv, result := range map[string]bool{`# Dynamic
nameserver 10.0.2.3
search docker.com`: false,
`# Dynamic
#nameserver 127.0.0.1
nameserver 10.0.2.3
search docker.com`: false,
`# Dynamic
nameserver 10.0.2.3 #not used 127.0.1.1
search docker.com`: false,
`# Dynamic
#nameserver 10.0.2.3
#search docker.com`: true,
`# Dynamic
nameserver 127.0.0.1
search docker.com`: true,
`# Dynamic
nameserver 127.0.1.1
search docker.com`: true,
`# Dynamic
`: true,
``: true,
} {
if CheckLocalDns([]byte(resolv)) != result {
t.Fatalf("Wrong local dns detection: {%s} should be %v", resolv, result)
}
}
}
func TestReplaceAndAppendEnvVars(t *testing.T) {
var (
d = []string{"HOME=/"}