github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8265 from pmorie/e2e

Browse Source 
Fix path construction bug in shell e2e
This commit is contained in:
Robert Bailey 2015-05-14 19:37:15 -07:00
commit a91a7bfe77
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/shell.go
View File

@ -20,23 +20,16 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"os/exec" "os/exec"
"path"
"path/filepath" "path/filepath"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
) )
var (
root = absOrDie(filepath.Clean(filepath.Join(path.Base(os.Args[0]), "..")))
)
var _ = Describe("Shell", func() { var _ = Describe("Shell", func() {
bashE2ERoot := filepath.Join(testContext.RepoRoot, "hack/e2e-suite")
defer GinkgoRecover()
// Slurp up all the tests in hack/e2e-suite // Slurp up all the tests in hack/e2e-suite
bashE2ERoot := filepath.Join(root, "hack/e2e-suite")
files, err := ioutil.ReadDir(bashE2ERoot) files, err := ioutil.ReadDir(bashE2ERoot)
if err != nil { if err != nil {
Fail(fmt.Sprintf("Error reading test suites from %v %v", bashE2ERoot, err.Error())) Fail(fmt.Sprintf("Error reading test suites from %v %v", bashE2ERoot, err.Error()))