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

Port remaining e2e tests to framework

Browse Source
This commit is contained in:
gmarek
2015-10-27 09:24:32 +01:00
parent 0150d87a73
commit e638a415d4
7 changed files with 39 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/examples.go
View File

@@ -48,23 +48,12 @@ except:
print 'err'`
var _ = Describe("Examples e2e", func() {
framework := NewFramework("examples")
var c *client.Client
var ns string
var testingNs *api.Namespace
BeforeEach(func() {
var err error
c, err = loadClient()
expectNoError(err)
testingNs, err = createTestingNS("examples", c)
ns = testingNs.Name
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
By(fmt.Sprintf("Destroying namespace for this suite %v", ns))
if err := deleteNS(c, ns, 5*time.Minute /* namespace deletion timeout */); err != nil {
Failf("Couldn't delete ns %s", err)
}
c = framework.Client
ns = framework.Namespace.Name
})
Describe("[Skipped][Example]Redis", func() {
@@ -476,10 +465,14 @@ var _ = Describe("Examples e2e", func() {
for i := range namespaces {
var err error
namespaces[i], err = createTestingNS(fmt.Sprintf("dnsexample%d", i), c)
if namespaces[i] != nil {
defer deleteNS(c, namespaces[i].Name, 5*time.Minute /* namespace deletion timeout */)
if testContext.DeleteNamespace {
if namespaces[i] != nil {
defer deleteNS(c, namespaces[i].Name, 5*time.Minute /* namespace deletion timeout */)
}
Expect(err).NotTo(HaveOccurred())
} else {
Logf("Found DeleteNamespace=false, skipping namespace deletion!")
}
Expect(err).NotTo(HaveOccurred())
}
for _, ns := range namespaces {