All e2e tests should use NewFramework

Allows someone to replace createTestingNS consistently
This commit is contained in:
Clayton Coleman
2015-10-21 22:28:39 -04:00
parent 507bc3de4f
commit a50fbd6636
11 changed files with 101 additions and 131 deletions

View File

@@ -48,7 +48,14 @@ const (
)
var _ = Describe("Daemon set", func() {
f := &Framework{BaseName: "daemonsets"}
var f *Framework
AfterEach(func() {
err := clearDaemonSetNodeLabels(f.Client)
Expect(err).NotTo(HaveOccurred())
})
f = NewFramework("daemonsets")
image := "gcr.io/google_containers/serve_hostname:1.1"
dsName := "daemon-set"
@@ -57,19 +64,12 @@ var _ = Describe("Daemon set", func() {
var c *client.Client
BeforeEach(func() {
f.beforeEach()
ns = f.Namespace.Name
c = f.Client
err := clearDaemonSetNodeLabels(c)
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
defer f.afterEach()
err := clearDaemonSetNodeLabels(f.Client)
Expect(err).NotTo(HaveOccurred())
})
It("should run and stop simple daemon", func() {
label := map[string]string{daemonsetNameLabel: dsName}