From 3668f6ab5b06919d96a54dce496274ad8325e559 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Thu, 14 May 2015 14:57:06 -0400 Subject: [PATCH] Fix path construction bug in shell e2e --- test/e2e/shell.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/test/e2e/shell.go b/test/e2e/shell.go index c8efb64dd6a..a81730c4780 100644 --- a/test/e2e/shell.go +++ b/test/e2e/shell.go @@ -20,23 +20,16 @@ import ( "bytes" "fmt" "io/ioutil" - "os" "os/exec" - "path" "path/filepath" . "github.com/onsi/ginkgo" ) -var ( - root = absOrDie(filepath.Clean(filepath.Join(path.Base(os.Args[0]), ".."))) -) - var _ = Describe("Shell", func() { + bashE2ERoot := filepath.Join(testContext.RepoRoot, "hack/e2e-suite") - defer GinkgoRecover() // Slurp up all the tests in hack/e2e-suite - bashE2ERoot := filepath.Join(root, "hack/e2e-suite") files, err := ioutil.ReadDir(bashE2ERoot) if err != nil { Fail(fmt.Sprintf("Error reading test suites from %v %v", bashE2ERoot, err.Error()))