ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #383 from dcbw/test-fixes

Browse Source 
tests: misc test fixes
This commit is contained in:
Dan Williams 2017-02-27 16:13:45 -06:00 committed by GitHub
commit 0b1b85413e
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testutils/cmd.go
View File

@ -46,13 +46,15 @@ func CmdAddWithResult(cniNetns, cniIfname string, conf []byte, f func() error) (
os.Stdout = w os.Stdout = w
err = f() err = f()
w.Close() w.Close()
if err != nil {
return nil, nil, err
}
// parse the result var out []byte
out, err := ioutil.ReadAll(r) if err == nil {
out, err = ioutil.ReadAll(r)
}
os.Stdout = oldStdout os.Stdout = oldStdout
// Return errors after restoring stdout so Ginkgo will correctly
// emit verbose error information on stdout
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

4
types/current/types_suite_test.go
View File

@ -21,7 +21,7 @@ import (
"testing" "testing"
) )
func TestTypes010(t *testing.T) { func TestTypesCurrent(t *testing.T) {
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
RunSpecs(t, "0.3.0 Types Suite") RunSpecs(t, "Current Types Suite")
} }

4
types/current/types_test.go
View File

@ -81,7 +81,7 @@ func testResult() *current.Result {
} }
} }
var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() { var _ = Describe("Current types operations", func() {
It("correctly encodes a 0.3.0 Result", func() { It("correctly encodes a 0.3.0 Result", func() {
res := testResult() res := testResult()
@ -150,7 +150,6 @@ var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() {
}`)) }`))
}) })
var _ = Describe("Ensures compatibility with the 0.1.0 spec", func() {
It("correctly encodes a 0.1.0 Result", func() { It("correctly encodes a 0.1.0 Result", func() {
res, err := testResult().GetAsVersion("0.1.0") res, err := testResult().GetAsVersion("0.1.0")
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -210,5 +209,4 @@ var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() {
} }
}`)) }`))
}) })
})
}) })