diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-23 06:32:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 06:32:41 -0400 |
| commit | 2df9bdc00948e24855f3da42e31a6d273861e380 (patch) | |
| tree | a2b25921510922eb921c24bc13fb95228d41e0b7 /test | |
| parent | 31231ffd748d10048e6541b18fd863a66342c6c7 (diff) | |
| parent | 5b4af0584d1c66b4f8d3d721374541fb76b5b395 (diff) | |
| download | podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.gz podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.bz2 podman-2df9bdc00948e24855f3da42e31a6d273861e380.zip | |
Merge pull request #13973 from Luap99/linter-revive
replace golint with revive linter
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 10 | ||||
| -rw-r--r-- | test/e2e/config_amd64.go | 16 | ||||
| -rw-r--r-- | test/system/450-interactive.bats | 2 | ||||
| -rw-r--r-- | test/testvol/main.go | 2 | ||||
| -rw-r--r-- | test/utils/matchers.go | 2 | ||||
| -rw-r--r-- | test/utils/utils.go | 6 |
6 files changed, 19 insertions, 19 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index f808eb2b6..5e0c6e837 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -35,12 +35,12 @@ import ( var ( //lint:ignore ST1003 - PODMAN_BINARY string //nolint:golint,stylecheck - INTEGRATION_ROOT string //nolint:golint,stylecheck - CGROUP_MANAGER = "systemd" //nolint:golint,stylecheck - RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:golint,stylecheck + PODMAN_BINARY string //nolint:revive,stylecheck + INTEGRATION_ROOT string //nolint:revive,stylecheck + CGROUP_MANAGER = "systemd" //nolint:revive,stylecheck + RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:revive,stylecheck defaultWaitTimeout = 90 - CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:golint,stylecheck + CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:revive,stylecheck ) // PodmanTestIntegration struct for command line options diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index 9293fdd44..c4cb97b2e 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -1,16 +1,16 @@ package integration var ( - STORAGE_FS = "vfs" //nolint:golint,stylecheck - STORAGE_OPTIONS = "--storage-driver vfs" //nolint:golint,stylecheck - ROOTLESS_STORAGE_FS = "vfs" //nolint:golint,stylecheck - ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:golint,stylecheck - CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:golint,stylecheck + STORAGE_FS = "vfs" //nolint:revive,stylecheck + STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck + ROOTLESS_STORAGE_FS = "vfs" //nolint:revive,stylecheck + ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck + CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:revive,stylecheck nginx = "quay.io/libpod/alpine_nginx:latest" - BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:golint,stylecheck + BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck registry = "quay.io/libpod/registry:2.6" labels = "quay.io/libpod/alpine_labels:latest" - UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:golint,stylecheck - UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:golint,stylecheck + UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:revive,stylecheck + UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:revive,stylecheck cirros = "quay.io/libpod/cirros:latest" ) diff --git a/test/system/450-interactive.bats b/test/system/450-interactive.bats index a642a2e95..e6e67a8a7 100644 --- a/test/system/450-interactive.bats +++ b/test/system/450-interactive.bats @@ -75,7 +75,7 @@ function teardown() { @test "podman load - will not read from tty" { run_podman 125 load <$PODMAN_TEST_PTY is "$output" \ - "Error: cannot read from terminal. Use command-line redirection or the --input flag." \ + "Error: cannot read from terminal, use command-line redirection or the --input flag" \ "Diagnostic from 'podman load' without redirection or -i" } diff --git a/test/testvol/main.go b/test/testvol/main.go index d15bf00cd..883f55f82 100644 --- a/test/testvol/main.go +++ b/test/testvol/main.go @@ -31,7 +31,7 @@ type cliConfig struct { } // Default configuration is stored here. Will be overwritten by flags. -var config cliConfig = cliConfig{ +var config = cliConfig{ logLevel: "error", sockName: "test-volume-plugin", } diff --git a/test/utils/matchers.go b/test/utils/matchers.go index 0c0948e4b..c56bd55c3 100644 --- a/test/utils/matchers.go +++ b/test/utils/matchers.go @@ -6,7 +6,7 @@ import ( "net/url" "github.com/containers/common/pkg/config" - . "github.com/onsi/gomega" //nolint:golint,stylecheck + . "github.com/onsi/gomega" //nolint:revive,stylecheck "github.com/onsi/gomega/format" "github.com/onsi/gomega/gexec" "github.com/onsi/gomega/matchers" diff --git a/test/utils/utils.go b/test/utils/utils.go index 9695835e5..0867570c1 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -15,9 +15,9 @@ import ( "github.com/sirupsen/logrus" "github.com/containers/storage/pkg/parsers/kernel" - . "github.com/onsi/ginkgo" //nolint:golint,stylecheck - . "github.com/onsi/gomega" //nolint:golint,stylecheck - . "github.com/onsi/gomega/gexec" //nolint:golint,stylecheck + . "github.com/onsi/ginkgo" //nolint:revive,stylecheck + . "github.com/onsi/gomega" //nolint:revive,stylecheck + . "github.com/onsi/gomega/gexec" //nolint:revive,stylecheck ) type NetworkBackend int |