Merge pull request #383 from dcbw/test-fixes

tests: misc test fixes

testutils/cmd.go

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

types/current/types_suite_test.go

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

types/current/types_test.go

@@ -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() {
 		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() {
 		res, err := testResult().GetAsVersion("0.1.0")
 		Expect(err).NotTo(HaveOccurred())
@@ -211,4 +210,3 @@ var _ = Describe("Ensures compatibility with the 0.3.0 spec", func() {
 }`))
 	})
 })
-})