Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correctly skip daemon restart tests unless running on GCE #15884

Merged
merged 1 commit into from
Oct 20, 2015
Merged

Correctly skip daemon restart tests unless running on GCE #15884

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 2 additions & 11 deletions test/e2e/daemon_restart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

Expand All @@ -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)
Expand Down