github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

node_e2e: do not return error if Docker's check-config.sh fails

Browse Source
This commit is contained in:
Yang Guo 2017-12-19 20:50:09 -08:00
parent f302487942
commit 7e1d74ead2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e_node/gke_environment_test.go
View File

@ -139,10 +139,10 @@ func checkDockerConfig() error {
if _, err := os.Stat(bin); os.IsNotExist(err) { if _, err := os.Stat(bin); os.IsNotExist(err) {
continue continue
} }
output, err := runCommand(bin) // We don't check the return code because it's OK if the script returns
if err != nil { // a non-zero exit code just because the configs in the whitelist are
return err // missing.
} output, _ := runCommand(bin)
for _, line := range strings.Split(output, "\n") { for _, line := range strings.Split(output, "\n") {
if !strings.Contains(line, "missing") { if !strings.Contains(line, "missing") {
continue continue