Merge pull request #8473 from ixdy/native-ginkgo-runner

Use native Ginkgo test runner instead of cmd/e2e (attempt N+1)
This commit is contained in:
Maxwell Forbes
2015-05-19 10:48:14 -07:00
9 changed files with 196 additions and 293 deletions

View File

@@ -46,6 +46,7 @@ const (
)
var _ = Describe("kubectl", func() {
defer GinkgoRecover()
var c *client.Client
var ns string
var testingNs *api.Namespace
@@ -66,11 +67,12 @@ var _ = Describe("kubectl", func() {
})
Describe("update-demo", func() {
var (
var updateDemoRoot, nautilusPath, kittenPath string
BeforeEach(func() {
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)
@@ -106,7 +108,10 @@ var _ = Describe("kubectl", func() {
})
Describe("guestbook", func() {
var guestbookPath = filepath.Join(testContext.RepoRoot, "examples/guestbook")
var guestbookPath string
BeforeEach(func() {
guestbookPath = filepath.Join(testContext.RepoRoot, "examples/guestbook")
})
It("should create and stop a working application", func() {
if !providerIs("gce", "gke") {