Skip all testdata in integration

Also skip.IfCondition directly from the test, so that the skip message is correct

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 104c1c68438c5c59ab0e7a5fb2da6bae4ce6d080
Component: engine

components/engine/hack/make/.integration-test-helpers

@@ -15,7 +15,7 @@ source "$SCRIPTDIR/make/.go-autogen"
 
 integration_api_dirs=${TEST_INTEGRATION_DIR:-"$(
 	find ./integration -type d |
-	grep -vE '^(./integration($|/util|/testdata|/plugin$))')"}
+	grep -vE '(^./integration($|/util)|/testdata)')"}
 
 run_test_integration() {
 	[[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites

components/engine/integration/plugin/authz/authz_plugin_v2_test.go

@@ -31,7 +31,7 @@ var (
 
 func setupTestV2(t *testing.T) func() {
 	skip.IfCondition(t, testEnv.DaemonInfo.OSType != "linux")
-	requirement.HasHubConnectivity(t)
+	skip.IfCondition(t, !requirement.HasHubConnectivity(t))
 
 	teardown := setupTest(t)
 

components/engine/integration/plugin/pkg_test.go

@@ -0,0 +1 @@
+package plugin

components/engine/integration/util/requirement/requirement.go

@@ -5,21 +5,16 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/gotestyourself/gotestyourself/skip"
 )
 
 // HasHubConnectivity checks to see if https://hub.docker.com is
 // accessible from the present environment
-func HasHubConnectivity(t *testing.T) {
+func HasHubConnectivity(t *testing.T) bool {
 	// Set a timeout on the GET at 15s
 	var timeout = 15 * time.Second
 	var url = "https://hub.docker.com"
 
-	client := http.Client{
-		Timeout: timeout,
-	}
-
+	client := http.Client{Timeout: timeout}
 	resp, err := client.Get(url)
 	if err != nil && strings.Contains(err.Error(), "use of closed network connection") {
 		t.Fatalf("Timeout for GET request on %s", url)
@@ -27,5 +22,5 @@ func HasHubConnectivity(t *testing.T) {
 	if resp != nil {
 		resp.Body.Close()
 	}
-	skip.IfCondition(t, err != nil)
+	return err == nil
 }