From f419f407c26e229a67d256fc340fe1308d99c794 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 19 Oct 2015 13:58:22 -0700 Subject: [PATCH] Correctly skip daemon restart tests unless running on GCE --- test/e2e/daemon_restart.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index 5e1a797a695..db07280f3ed 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -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)