tests: include npipe connhelper in integration test package

Signed-off-by: Höhl, Lukas <[email protected]>

client/client_test.go

@@ -64,8 +64,6 @@ import (
 	"github.com/moby/buildkit/util/testutil/httpserver"
 	"github.com/moby/buildkit/util/testutil/integration"
 	"github.com/moby/buildkit/util/testutil/workers"
-	// include npipe connhelper for windows tests
-	_ "github.com/moby/buildkit/client/connhelper/npipe"
 	digest "github.com/opencontainers/go-digest"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -3795,7 +3793,7 @@ func testBuildExportWithUncompressed(t *testing.T, sb integration.Sandbox) {
 	dt, err := content.ReadBlob(ctx, img.ContentStore(), img.Target())
 	require.NoError(t, err)
 
-	var mfst = struct {
+	mfst := struct {
 		MediaType string `json:"mediaType,omitempty"`
 		ocispecs.Manifest
 	}{}
@@ -4064,6 +4062,7 @@ func testPullZstdImage(t *testing.T, sb integration.Sandbox) {
 		})
 	}
 }
+
 func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) {
 	workers.CheckFeatureCompat(t, sb, workers.FeatureDirectPush)
 	requiresLinux(t)
@@ -4202,7 +4201,7 @@ func testBuildPushAndValidate(t *testing.T, sb integration.Sandbox) {
 	dt, err = content.ReadBlob(ctx, img.ContentStore(), img.Target())
 	require.NoError(t, err)
 
-	var mfst = struct {
+	mfst := struct {
 		MediaType string `json:"mediaType,omitempty"`
 		ocispecs.Manifest
 	}{}
@@ -5280,7 +5279,8 @@ func testBasicCacheImportExport(t *testing.T, sb integration.Sandbox, cacheOptio
 			{
 				Type:      ExporterLocal,
 				OutputDir: destDir,
-			}},
+			},
+		},
 		CacheImports: cacheOptionsEntryImport,
 	}, nil)
 	require.NoError(t, err)
@@ -5743,10 +5743,12 @@ func testMultipleRecordsWithSameLayersCacheImportExport(t *testing.T, sb integra
 
 	base := llb.Image("busybox:latest")
 	// layerA and layerB create identical layers with different LLB
-	layerA := base.Run(llb.Args([]string{"sh", "-c",
+	layerA := base.Run(llb.Args([]string{
+		"sh", "-c",
 		`echo $(( 1 + 2 )) > /result && touch -d "1970-01-01 00:00:00" /result`,
 	})).Root()
-	layerB := base.Run(llb.Args([]string{"sh", "-c",
+	layerB := base.Run(llb.Args([]string{
+		"sh", "-c",
 		`echo $(( 2 + 1 )) > /result && touch -d "1970-01-01 00:00:00" /result`,
 	})).Root()
 
@@ -9637,7 +9639,8 @@ func testMountStubsTimestamp(t *testing.T, sb integration.Sandbox) {
 
 	const sourceDateEpoch = int64(1234567890) // Fri Feb 13 11:31:30 PM UTC 2009
 	st := llb.Image("busybox:latest").Run(
-		llb.Args([]string{"/bin/touch", fmt.Sprintf("--date=@%d", sourceDateEpoch),
+		llb.Args([]string{
+			"/bin/touch", fmt.Sprintf("--date=@%d", sourceDateEpoch),
 			"/bin",
 			"/etc",
 			"/var",
@@ -9808,8 +9811,10 @@ func (*secModeInsecure) UpdateConfigFile(in string) string {
 	return in + "\n\ninsecure-entitlements = [\"security.insecure\"]\n"
 }
 
-var securitySandbox integration.ConfigUpdater = &secModeSandbox{}
-var securityInsecure integration.ConfigUpdater = &secModeInsecure{}
+var (
+	securitySandbox  integration.ConfigUpdater = &secModeSandbox{}
+	securityInsecure integration.ConfigUpdater = &secModeInsecure{}
+)
 
 type netModeHost struct{}
 
@@ -9841,9 +9846,11 @@ nameservers = ["10.11.0.1"]
 `
 }
 
-var hostNetwork integration.ConfigUpdater = &netModeHost{}
-var defaultNetwork integration.ConfigUpdater = &netModeDefault{}
-var bridgeDNSNetwork integration.ConfigUpdater = &netModeBridgeDNS{}
+var (
+	hostNetwork      integration.ConfigUpdater = &netModeHost{}
+	defaultNetwork   integration.ConfigUpdater = &netModeDefault{}
+	bridgeDNSNetwork integration.ConfigUpdater = &netModeBridgeDNS{}
+)
 
 func fixedWriteCloser(wc io.WriteCloser) filesync.FileOutputFunc {
 	return func(map[string]string) (io.WriteCloser, error) {

util/testutil/integration/util_windows.go

@@ -4,6 +4,9 @@ import (
 	"net"
 
 	"github.com/Microsoft/go-winio"
+
+	// include npipe connhelper for windows tests
+	_ "github.com/moby/buildkit/client/connhelper/npipe"
 )
 
 var socketScheme = "npipe://"