diff --git a/.golangci.yml b/.golangci.yml index fec369f6d..3b0b619c3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -32,6 +32,8 @@ issues: - path: 'archive[\\/]tarheader[\\/]' # conversion is necessary on Linux, unnecessary on macOS text: "unnecessary conversion" + - path: 'integration[\\/]client' + text: "dot-imports:" - linters: - revive text: "if-return" @@ -63,6 +65,8 @@ linters-settings: - G306 - G402 - G404 + nolintlint: + allow-unused: true run: timeout: 8m diff --git a/integration/client/client.go b/integration/client/client.go index c72294efc..637270bdf 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -33,6 +33,7 @@ const ( testNamespace = "testing" ) +//nolint:unused // some variables used in fuzz but not all platforms var ( address string ctrdStdioFilePath string diff --git a/integration/client/client_unix.go b/integration/client/client_unix.go index 6e8ae3e98..f7198bbc8 100644 --- a/integration/client/client_unix.go +++ b/integration/client/client_unix.go @@ -18,6 +18,7 @@ package client +//nolint:unused // some variables used for fuzz const ( defaultRoot = "/var/lib/containerd-test" defaultState = "/run/containerd-test" diff --git a/integration/client/client_windows_test.go b/integration/client/client_windows_test.go index 7638fff68..65856035f 100644 --- a/integration/client/client_windows_test.go +++ b/integration/client/client_windows_test.go @@ -25,6 +25,7 @@ import ( _ "github.com/Microsoft/hcsshim/test/functional/manifest" // For rsrc_amd64.syso ) +//nolint:unused // some variables used for fuzz const ( defaultAddress = `\\.\pipe\containerd-containerd-test` ) diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index c8b7e37ac..dba590531 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -41,7 +41,6 @@ import ( exec "golang.org/x/sys/execabs" ) -//nolint:unused // Ignore on non-Linux func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, func()) { if testing.Short() { t.Skip() @@ -263,11 +262,6 @@ func testRestartMonitorPausedTaskWithAlways(t *testing.T, client *Client, interv t.Skip("Pause task is not supported on Windows") } - const ( - epsilon = 1 * time.Second - count = 20 - ) - var ( ctx, cancel = testContext(t) id = strings.ReplaceAll(t.Name(), "/", "_")