github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 17:38:50 +00:00
Code Issues Projects Releases Wiki Activity

Make all e2e tests use Framework

Browse Source
This commit is contained in:
Jeff Grafton
2016-02-09 15:50:07 -08:00
parent c1e79e4264
commit 220b5e3e8e
5 changed files with 18 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/restart.go
View File

@@ -49,37 +49,28 @@ const (
)
var _ = Describe("Restart [Disruptive]", func() {
var c *client.Client
f := NewFramework("restart")
var ps *podStore
var skipped bool
BeforeEach(func() {
var err error
c, err = loadClient()
Expect(err).NotTo(HaveOccurred())
// This test requires the ability to restart all nodes, so the provider
// check must be identical to that call.
skipped = true
SkipUnlessProviderIs("gce", "gke")
skipped = false
ps = newPodStore(c, api.NamespaceSystem, labels.Everything(), fields.Everything())
ps = newPodStore(f.Client, api.NamespaceSystem, labels.Everything(), fields.Everything())
})
AfterEach(func() {
if skipped {
return
if ps != nil {
ps.Stop()
}
ps.Stop()
})
It("should restart all nodes and ensure all nodes and pods recover", func() {
nn := testContext.CloudConfig.NumNodes
By("ensuring all nodes are ready")
nodeNamesBefore, err := checkNodesReady(c, nodeReadyInitialTimeout, nn)
nodeNamesBefore, err := checkNodesReady(f.Client, nodeReadyInitialTimeout, nn)
Expect(err).NotTo(HaveOccurred())
Logf("Got the following nodes before restart: %v", nodeNamesBefore)
@@ -90,7 +81,7 @@ var _ = Describe("Restart [Disruptive]", func() {
podNamesBefore[i] = p.ObjectMeta.Name
}
ns := api.NamespaceSystem
if !checkPodsRunningReady(c, ns, podNamesBefore, podReadyBeforeTimeout) {
if !checkPodsRunningReady(f.Client, ns, podNamesBefore, podReadyBeforeTimeout) {
Failf("At least one pod wasn't running and ready at test start.")
}
@@ -99,7 +90,7 @@ var _ = Describe("Restart [Disruptive]", func() {
Expect(err).NotTo(HaveOccurred())
By("ensuring all nodes are ready after the restart")
nodeNamesAfter, err := checkNodesReady(c, restartNodeReadyAgainTimeout, nn)
nodeNamesAfter, err := checkNodesReady(f.Client, restartNodeReadyAgainTimeout, nn)
Expect(err).NotTo(HaveOccurred())
Logf("Got the following nodes after restart: %v", nodeNamesAfter)
@@ -119,7 +110,7 @@ var _ = Describe("Restart [Disruptive]", func() {
podNamesAfter, err := waitForNPods(ps, len(podNamesBefore), restartPodReadyAgainTimeout)
Expect(err).NotTo(HaveOccurred())
remaining := restartPodReadyAgainTimeout - time.Since(podCheckStart)
if !checkPodsRunningReady(c, ns, podNamesAfter, remaining) {
if !checkPodsRunningReady(f.Client, ns, podNamesAfter, remaining) {
Failf("At least one pod wasn't running and ready after the restart.")
}
})