Skip to content

Commit

Permalink
Merge pull request #3222 from tstromberg/scary-status
Browse files Browse the repository at this point in the history
Remove scary temporary non-failures so that they do not distract from real ones
  • Loading branch information
tstromberg authored Oct 6, 2018
2 parents 5b0d189 + 07015bf commit c01c554
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion test/integration/cluster_dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func waitForDNS(t *testing.T, c kubernetes.Interface) {
t.Fatalf("Waited too long for k8s-app=kube-dns pods")
}
if err := commonutil.WaitForDeploymentToStabilize(c, "kube-system", "kube-dns", time.Minute*2); err != nil {
t.Fatalf("kube-dns deployment failed became stable within 2 minutes")
t.Fatalf("kube-dns deployment failed to stabilize within 2 minutes")
}
}

Expand Down
1 change: 0 additions & 1 deletion test/integration/cluster_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func testClusterStatus(t *testing.T) {
if c.Type != api.ComponentHealthy {
continue
}
t.Logf("Component: %v, Healthy: %s.\n", i.GetName(), c.Status)
status = c.Status
}
if status != api.ConditionTrue {
Expand Down
1 change: 0 additions & 1 deletion test/integration/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ func Retry(t *testing.T, callback func() error, d time.Duration, attempts int) (
if err == nil {
return nil
}
t.Logf("Error: %s, Retrying in %s. %d Retries remaining.", err, d, attempts-i)
time.Sleep(d)
}
return err
Expand Down

0 comments on commit c01c554

Please sign in to comment.