Use different containerd sock address in tests

kiashok · kiashok · commit 8c76e794820b · 2024-04-09T20:26:35.000-07:00
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 5b6ae0f) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
diff --git a/integration/client/client.go b/integration/client/client.go
@@ -24,7 +24,6 @@ import (
 	"testing"
 
 	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/defaults"
 	"github.com/containerd/containerd/log/logtest"
 	"github.com/containerd/containerd/namespaces"
 )
@@ -41,7 +40,7 @@ var (
 )
 
 func init() {
-	flag.StringVar(&address, "address", defaults.DefaultAddress, "The address to the containerd socket for use in the tests")
+	flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests")
 }
 
 func testContext(t testing.TB) (context.Context, context.CancelFunc) {
diff --git a/integration/client/client_windows.go b/integration/client/client_windows.go
@@ -0,0 +1,39 @@
+//go:build windows
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+/*
+   Copyright 2024 The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package client
+
+const (
+	defaultAddress = `\\.\pipe\containerd-containerd-test`
+)
diff --git a/integration/client/client_windows_test.go b/integration/client/client_windows_test.go
@@ -25,10 +25,6 @@ import (
 	_ "github.com/Microsoft/hcsshim/test/functional/manifest" // For rsrc_amd64.syso
 )
 
-const (
-	defaultAddress = `\\.\pipe\containerd-containerd-test`
-)
-
 var (
 	defaultRoot           = filepath.Join(os.Getenv("programfiles"), "containerd", "root-test")
 	defaultState          = filepath.Join(os.Getenv("programfiles"), "containerd", "state-test")

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import (`
`24`	`24`	`"testing"`
`25`	`25`
`26`	`26`	`"github.com/containerd/containerd"`
`27`		`- "github.com/containerd/containerd/defaults"`
`28`	`27`	`"github.com/containerd/containerd/log/logtest"`
`29`	`28`	`"github.com/containerd/containerd/namespaces"`
`30`	`29`	`)`
`@@ -41,7 +40,7 @@ var (`
`41`	`40`	`)`
`42`	`41`
`43`	`42`	`func init() {`
`44`		`- flag.StringVar(&address, "address", defaults.DefaultAddress, "The address to the containerd socket for use in the tests")`
	`43`	`+ flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests")`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`func testContext(t testing.TB) (context.Context, context.CancelFunc) {`