github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

test no longer fails when it fails to get the summary

Browse Source
This commit is contained in:
David Ashpole 2016-12-16 11:50:43 -08:00
parent 84d0fbdb2e
commit 5d352439d4
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e_node/inode_eviction_test.go
View File

@ -146,7 +146,9 @@ func runEvictionTest(f *framework.Framework, testCondition string, podTestSpecs
It(fmt.Sprintf("should eventually see %s, and then evict all of the correct pods", testCondition), func() { It(fmt.Sprintf("should eventually see %s, and then evict all of the correct pods", testCondition), func() {
Eventually(func() error { Eventually(func() error {
hasPressure, err := hasPressureCondition(f, testCondition) hasPressure, err := hasPressureCondition(f, testCondition)
framework.ExpectNoError(err, fmt.Sprintf("checking if we have %s", testCondition)) if err != nil {
return err
}
if hasPressure { if hasPressure {
return nil return nil
} }
@ -161,7 +163,9 @@ func runEvictionTest(f *framework.Framework, testCondition string, podTestSpecs
framework.Logf("fetching pod %s; phase= %v", p.Name, p.Status.Phase) framework.Logf("fetching pod %s; phase= %v", p.Name, p.Status.Phase)
} }
_, err = hasPressureCondition(f, testCondition) _, err = hasPressureCondition(f, testCondition)
framework.ExpectNoError(err, fmt.Sprintf("checking if we have %s", testCondition)) if err != nil {
return err
}
By("checking eviction ordering and ensuring important pods dont fail") By("checking eviction ordering and ensuring important pods dont fail")
done := true done := true
@ -216,7 +220,9 @@ func runEvictionTest(f *framework.Framework, testCondition string, podTestSpecs
By("making sure conditions eventually return to normal") By("making sure conditions eventually return to normal")
Eventually(func() error { Eventually(func() error {
hasPressure, err := hasPressureCondition(f, testCondition) hasPressure, err := hasPressureCondition(f, testCondition)
framework.ExpectNoError(err, fmt.Sprintf("checking if we have %s", testCondition)) if err != nil {
return err
}
if hasPressure { if hasPressure {
return fmt.Errorf("Conditions havent returned to normal, we still have %s", testCondition) return fmt.Errorf("Conditions havent returned to normal, we still have %s", testCondition)
} }
@ -226,7 +232,12 @@ func runEvictionTest(f *framework.Framework, testCondition string, podTestSpecs
By("making sure conditions do not return") By("making sure conditions do not return")
Consistently(func() error { Consistently(func() error {
hasPressure, err := hasPressureCondition(f, testCondition) hasPressure, err := hasPressureCondition(f, testCondition)
framework.ExpectNoError(err, fmt.Sprintf("checking if we have %s", testCondition)) if err != nil {
// Race conditions sometimes occur when checking pressure condition due to #38710 (Docker bug)
// Do not fail the test when this occurs, since this is expected to happen occasionally.
framework.Logf("Failed to check pressure condition. Error: %v", err)
return nil
}
if hasPressure { if hasPressure {
return fmt.Errorf("%s dissappeared and then reappeared", testCondition) return fmt.Errorf("%s dissappeared and then reappeared", testCondition)
} }