summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2019-04-05 19:49:36 -0500
committerbaude <bbaude@redhat.com>2019-04-05 20:09:45 -0500
commit23602de816b9ee3e92a8cbac295e955ba43fa283 (patch)
tree8ae6789a7e7e5e52de2270bb3854f01dc55b9949 /test/e2e
parentbc320be00bc584bd88525266d23a9d5edb9d44f8 (diff)
downloadpodman-23602de816b9ee3e92a8cbac295e955ba43fa283.tar.gz
podman-23602de816b9ee3e92a8cbac295e955ba43fa283.tar.bz2
podman-23602de816b9ee3e92a8cbac295e955ba43fa283.zip
Revert "Switch to golangci-lint"
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/common_test.go17
1 files changed, 9 insertions, 8 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 0b3db32f4..b20b3b37e 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -22,14 +22,15 @@ 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}
+ 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
)
// PodmanTestIntegration struct for command line options