github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7379 from ixdy/update-ginkgo 

Update Ginkgo to latest HEAD release with one-character fix
pull/6/head
Jeff Grafton 2015-04-27 16:31:26 -07:00
parent 734663f8d8 e235a4b07e
commit 9b215dbe38
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -328,8 +328,8 @@
},
{
"ImportPath": "github.com/onsi/ginkgo",
"Comment": "v1.1.0-42-gdbb5c6c",
"Rev": "dbb5c6caf33238b57facc1d975b1aaca6b90288c"
"Comment": "v1.1.0-44-gae043a2",
"Rev": "ae043a2b2a91d6441adedc96d2c01958a78ee516"
},
{
"ImportPath": "github.com/onsi/gomega",

2
Godeps/_workspace/src/github.com/onsi/ginkgo/ginkgo/testrunner/test_runner.go generated vendored
View File

@ -291,7 +291,7 @@ func (t *TestRunner) runParallelGinkgoSuite() RunResult {
}
func (t *TestRunner) cmd(ginkgoArgs []string, stream io.Writer, node int) *exec.Cmd {
args := []string{"-test.timeout=24h"}
args := []string{"--test.timeout=24h"}
if t.cover {
coverprofile := "--test.coverprofile=" + t.Suite.PackageName + ".coverprofile"
if t.numCPU > 1 {