github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Use native Ginkgo test runner instead of cmd/e2e (attempt N)"

Browse Source
This commit is contained in:
Quinton Hoole
2015-05-18 21:04:26 -07:00
parent 964ac90aba
commit f4bb6aa37d
9 changed files with 293 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/kubectl.go
View File

@@ -45,7 +45,6 @@ const (
)
var _ = Describe("kubectl", func() {
defer GinkgoRecover()
var c *client.Client
var ns string
var testingNs *api.Namespace
@@ -66,12 +65,11 @@ var _ = Describe("kubectl", func() {
})
Describe("update-demo", func() {
var updateDemoRoot, nautilusPath, kittenPath string
BeforeEach(func() {
var (
updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo")
nautilusPath = filepath.Join(updateDemoRoot, "nautilus-rc.yaml")
kittenPath = filepath.Join(updateDemoRoot, "kitten-rc.yaml")
})
nautilusPath = filepath.Join(updateDemoRoot, "nautilus-rc.yaml")
kittenPath = filepath.Join(updateDemoRoot, "kitten-rc.yaml")
)
It("should create and stop a replication controller", func() {
defer cleanup(nautilusPath, ns, updateDemoSelector)
@@ -107,10 +105,7 @@ var _ = Describe("kubectl", func() {
})
Describe("guestbook", func() {
var guestbookPath string
BeforeEach(func() {
guestbookPath = filepath.Join(testContext.RepoRoot, "examples/guestbook")
})
var guestbookPath = filepath.Join(testContext.RepoRoot, "examples/guestbook")
It("should create and stop a working application", func() {
if !providerIs("gce", "gke") {