diff --git a/test/e2e/cluster_dns.go b/test/e2e/cluster_dns.go index b2ddc674e6d..3a817868aa6 100644 --- a/test/e2e/cluster_dns.go +++ b/test/e2e/cluster_dns.go @@ -22,6 +22,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/golang/glog" ) @@ -66,7 +67,7 @@ func TestClusterDNS(c *client.Client) bool { APIVersion: "v1beta1", }, ObjectMeta: api.ObjectMeta{ - Name: "dns-test", + Name: "dns-test-" + string(util.NewUUID()), }, Spec: api.PodSpec{ Volumes: []api.Volume{ @@ -104,7 +105,7 @@ func TestClusterDNS(c *client.Client) bool { } _, err := podClient.Create(pod) if err != nil { - glog.Errorf("Failed to create dns-test pod: %v", err) + glog.Errorf("Failed to create %s pod: %v", pod.Name, err) return false } defer podClient.Delete(pod.Name) @@ -112,7 +113,7 @@ func TestClusterDNS(c *client.Client) bool { waitForPodRunning(c, pod.Name) pod, err = podClient.Get(pod.Name) if err != nil { - glog.Errorf("Failed to get pod: %v", err) + glog.Errorf("Failed to get pod %s: %v", pod.Name, err) return false } @@ -130,22 +131,22 @@ func TestClusterDNS(c *client.Client) bool { Do().Raw() if err != nil { failed = append(failed, name) - glog.V(4).Infof("Lookup for %s failed: %v", name, err) + glog.V(4).Infof("Lookup using %s for %s failed: %v", pod.Name, name, err) } } if len(failed) == 0 { break } - glog.Infof("lookups failed for: %v", failed) - time.Sleep(3 * time.Second) + glog.Infof("lookups using %s failed for: %v", pod.Name, failed) + time.Sleep(10 * time.Second) } if len(failed) != 0 { - glog.Errorf("DNS failed for: %v", failed) + glog.Errorf("DNS using %s failed for: %v", pod.Name, failed) return false } // TODO: probe from the host, too. - glog.Info("DNS probes succeeded") + glog.Infof("DNS probes using %s succeeded", pod.Name) return true } diff --git a/test/e2e/driver.go b/test/e2e/driver.go index 69f6b15f1b1..f9421e3a053 100644 --- a/test/e2e/driver.go +++ b/test/e2e/driver.go @@ -69,7 +69,11 @@ func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed // TODO: Associate a timeout with each test individually. go func() { defer util.FlushLogs() - time.Sleep(10 * time.Minute) + // TODO: We should modify testSpec to include an estimated running time + // for each test and use that information to estimate a timeout + // value. Until then, as we add more tests (and before we move to + // parallel testing) we need to adjust this value as we add more tests. + time.Sleep(15 * time.Minute) glog.Fatalf("This test has timed out. Cleanup not guaranteed.") }()