Merge pull request #1076 from vdemeester/fix-e2e-system

Fix e2e/system tests

e2e/system/inspect_test.go

@@ -11,6 +11,8 @@ func TestInspectInvalidReference(t *testing.T) {
 	// This test should work on both Windows and Linux
 	result := icmd.RunCmd(icmd.Command("docker", "inspect", "FooBar"))
 	result.Assert(t, icmd.Expected{
-		Out: "[]\nError: No such object: FooBar",
+		Out:      "[]",
+		Err:      "Error: No such object: FooBar",
+		ExitCode: 1,
 	})
 }

e2e/system/main_test.go

@@ -0,0 +1,17 @@
+package system
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/docker/cli/internal/test/environment"
+)
+
+func TestMain(m *testing.M) {
+	if err := environment.Setup(); err != nil {
+		fmt.Println(err.Error())
+		os.Exit(3)
+	}
+	os.Exit(m.Run())
+}