Correctly skip daemon restart tests unless running on GCE

This commit is contained in:
Jeff Grafton 2015-10-19 13:58:22 -07:00
parent 18ad5f8cdf
commit f419f407c2

View File

@ -199,11 +199,8 @@ var _ = Describe("DaemonRestart", func() {
BeforeEach(func() {
// These tests require SSH
// TODO: Enable on gke after testing (#11834)
if !providerIs("gce") {
By(fmt.Sprintf("Skipping test, which is not implemented for %s", testContext.Provider))
return
}
// TODO(11834): Enable this test in GKE once experimental API there is switched on
SkipUnlessProviderIs("gce")
framework.beforeEach()
ns = framework.Namespace.Name
@ -285,9 +282,6 @@ var _ = Describe("DaemonRestart", func() {
It("Scheduler should continue assigning pods to nodes across restart", func() {
// TODO: Enabale this test in GKE once experimental API there is switched on
SkipIfProviderIs("gke")
restarter := NewRestartConfig(
getMasterHost(), "kube-scheduler", ports.SchedulerPort, restartPollInterval, restartTimeout)
@ -304,9 +298,6 @@ var _ = Describe("DaemonRestart", func() {
It("Kubelet should not restart containers across restart", func() {
// TODO: Enabale this test in GKE once experimental API there is switched on
SkipIfProviderIs("gke")
nodeIPs, err := getNodePublicIps(framework.Client)
expectNoError(err)
preRestarts, badNodes := getContainerRestarts(framework.Client, ns, labelSelector)