summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-04-05 11:02:41 -0400
committerGitHub <noreply@github.com>2019-04-05 11:02:41 -0400
commitbc320be00bc584bd88525266d23a9d5edb9d44f8 (patch)
treec6d03492ac9684f22cdf5e553321569369f1cf59 /test/e2e
parented8bd80d3f09fb5c82c53bde8d6779db2613f158 (diff)
parent023eba20db1912a477eedff529fa52d356033a38 (diff)
downloadpodman-bc320be00bc584bd88525266d23a9d5edb9d44f8.tar.gz
podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.tar.bz2
podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.zip
Merge pull request #2742 from openSUSE/golangci-lint
Switch to golangci-lint
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/common_test.go17
1 files changed, 8 insertions, 9 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index b20b3b37e..0b3db32f4 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -22,15 +22,14 @@ import (
)
var (
- PODMAN_BINARY string
- CONMON_BINARY string
- CNI_CONFIG_DIR string
- RUNC_BINARY string
- INTEGRATION_ROOT string
- CGROUP_MANAGER = "systemd"
- ARTIFACT_DIR = "/tmp/.artifacts"
- RESTORE_IMAGES = []string{ALPINE, BB}
- defaultWaitTimeout = 90
+ PODMAN_BINARY string
+ CONMON_BINARY string
+ CNI_CONFIG_DIR string
+ RUNC_BINARY string
+ INTEGRATION_ROOT string
+ CGROUP_MANAGER = "systemd"
+ ARTIFACT_DIR = "/tmp/.artifacts"
+ RESTORE_IMAGES = []string{ALPINE, BB}
)
// PodmanTestIntegration struct for command line options