Commit 56ea873f authored by Tim Hockin's avatar Tim Hockin

Merge pull request #4116 from zmerlynn/test_dns_on_gke

Reenable TestClusterDNS on GKE now that 0.9.2 is default
parents 7ffbe144 190afa54
...@@ -31,15 +31,6 @@ import ( ...@@ -31,15 +31,6 @@ import (
// TestClusterDNS checks that cluster DNS works. // TestClusterDNS checks that cluster DNS works.
func TestClusterDNS(c *client.Client) bool { func TestClusterDNS(c *client.Client) bool {
// TODO:
// https://github.com/GoogleCloudPlatform/kubernetes/issues/3305
// (but even if it's fixed, this will need a version check for
// skewed version tests)
if testContext.provider == "gke" {
glog.Infof("skipping TestClusterDNS on gke")
return true
}
if testContext.provider == "vagrant" { if testContext.provider == "vagrant" {
glog.Infof("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)") glog.Infof("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return true return true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment