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

Merge pull request #10880 from saad-ali/issue7840

Browse Source 
Fix "Docker Containers should be able to override the image's default command" tests
This commit is contained in:
Yu-Ju Hong 2015-07-07 17:35:18 -07:00
commit 1cdd34b759
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/util.go
View File

@ -895,6 +895,7 @@ func testContainerOutputInNamespace(scenarioName string, c *client.Client, pod *
// Sometimes the actual containers take a second to get started, try to get logs for 60s // Sometimes the actual containers take a second to get started, try to get logs for 60s
for time.Now().Sub(start) < (60 * time.Second) { for time.Now().Sub(start) < (60 * time.Second) {
err = nil
logs, err = c.Get(). logs, err = c.Get().
Prefix("proxy"). Prefix("proxy").
Resource("nodes"). Resource("nodes").
@ -902,14 +903,17 @@ func testContainerOutputInNamespace(scenarioName string, c *client.Client, pod *
Suffix("containerLogs", ns, podStatus.Name, containerName). Suffix("containerLogs", ns, podStatus.Name, containerName).
Do(). Do().
Raw() Raw()
fmt.Sprintf("pod logs:%v\n", string(logs)) if err == nil && strings.Contains(string(logs), "Internal Error") {
By(fmt.Sprintf("pod logs:%v\n", string(logs))) err = fmt.Errorf("Fetched log contains \"Internal Error\": %q.", string(logs))
if strings.Contains(string(logs), "Internal Error") { }
By(fmt.Sprintf("Failed to get logs from node %q pod %q container %q: %v", if err != nil {
podStatus.Spec.NodeName, podStatus.Name, containerName, string(logs))) By(fmt.Sprintf("Warning: Failed to get logs from node %q pod %q container %q. %v",
podStatus.Spec.NodeName, podStatus.Name, containerName, err))
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
continue continue
} }
By(fmt.Sprintf("Succesfully fetched pod logs:%v\n", string(logs)))
break break
} }