Skip to content

Commit 5b6ae0f

Browse files
committed
Use different containerd sock address in tests
Signed-off-by: Kirtana Ashok <[email protected]>
1 parent b0d00f8 commit 5b6ae0f

File tree

4 files changed

+40
-7
lines changed

4 files changed

+40
-7
lines changed

integration/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var (
4141
)
4242

4343
func init() {
44-
flag.StringVar(&address, "address", defaults.DefaultAddress, "The address to the containerd socket for use in the tests")
44+
flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests")
4545
}
4646

4747
func testContext(t testing.TB) (context.Context, context.CancelFunc) {

integration/client/client_unix.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
package client
2020

21-
//nolint:unused // some variables used for fuzz
2221
const (
2322
defaultRoot = "/var/lib/containerd-test"
2423
defaultState = "/run/containerd-test"

integration/client/client_windows.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
//go:build windows
2+
3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
19+
/*
20+
Copyright 2024 The containerd Authors.
21+
22+
Licensed under the Apache License, Version 2.0 (the "License");
23+
you may not use this file except in compliance with the License.
24+
You may obtain a copy of the License at
25+
26+
http://www.apache.org/licenses/LICENSE-2.0
27+
28+
Unless required by applicable law or agreed to in writing, software
29+
distributed under the License is distributed on an "AS IS" BASIS,
30+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
31+
See the License for the specific language governing permissions and
32+
limitations under the License.
33+
*/
34+
35+
package client
36+
37+
const (
38+
defaultAddress = `\\.\pipe\containerd-containerd-test`
39+
)

integration/client/client_windows_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ import (
2424
"github.com/Microsoft/hcsshim/osversion"
2525
)
2626

27-
//nolint:unused // some variables used for fuzz
28-
const (
29-
defaultAddress = `\\.\pipe\containerd-containerd-test`
30-
)
31-
3227
var (
3328
defaultRoot = filepath.Join(os.Getenv("programfiles"), "containerd", "root-test")
3429
defaultState = filepath.Join(os.Getenv("programfiles"), "containerd", "state-test")

0 commit comments

Comments
 (0)