diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-22 12:56:19 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-22 12:56:19 -0400 |
| commit | e41089244b300af2b3e51ac1e9501b4cfe42264e (patch) | |
| tree | 7e55e6dbe5037ca446cea38cf398bcf63e8ba4d5 /test | |
| parent | 35567e706b5009ead40c0eaef7c5c1199cd8d448 (diff) | |
| download | podman-e41089244b300af2b3e51ac1e9501b4cfe42264e.tar.gz podman-e41089244b300af2b3e51ac1e9501b4cfe42264e.tar.bz2 podman-e41089244b300af2b3e51ac1e9501b4cfe42264e.zip | |
Attempt to turn on build_without_cgo tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/apiv2/test-apiv2 | 2 | ||||
| -rw-r--r-- | test/e2e/libpod_suite_remote_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/libpod_suite_varlink_test.go | 2 | ||||
| -rw-r--r-- | test/endpoint/endpoint.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2 index 1af76b4be..11c914704 100755 --- a/test/apiv2/test-apiv2 +++ b/test/apiv2/test-apiv2 @@ -270,7 +270,7 @@ function start_service() { die "Cannot start service on non-localhost ($HOST)" fi - $PODMAN_BIN --root $WORKDIR system service --timeout 15 tcp:127.0.0.1:$PORT \ + $PODMAN_BIN --root $WORKDIR system service --time 15 tcp:127.0.0.1:$PORT \ &> $WORKDIR/server.log & service_pid=$! diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index e8cdf91ee..dde853413 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -95,7 +95,7 @@ func (p *PodmanTestIntegration) StartRemoteService() { args = append(args, "--log-level", "debug") } remoteSocket := p.RemoteSocket - args = append(args, "system", "service", "--timeout", "0", remoteSocket) + args = append(args, "system", "service", "--time", "0", remoteSocket) podmanOptions := getRemoteOptions(p, args) command := exec.Command(p.PodmanBinary, podmanOptions...) command.Stdout = os.Stdout diff --git a/test/e2e/libpod_suite_varlink_test.go b/test/e2e/libpod_suite_varlink_test.go index cbaed71cc..92c815b39 100644 --- a/test/e2e/libpod_suite_varlink_test.go +++ b/test/e2e/libpod_suite_varlink_test.go @@ -89,7 +89,7 @@ func (p *PodmanTestIntegration) StartVarlink() { varlinkEndpoint := p.RemoteSocket p.SetVarlinkAddress(p.RemoteSocket) - args := []string{"varlink", "--timeout", "0", varlinkEndpoint} + args := []string{"varlink", "--time", "0", varlinkEndpoint} podmanOptions := getVarlinkOptions(p, args) command := exec.Command(p.PodmanBinary, podmanOptions...) fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) diff --git a/test/endpoint/endpoint.go b/test/endpoint/endpoint.go index 284f0d79c..6f4ae6b1f 100644 --- a/test/endpoint/endpoint.go +++ b/test/endpoint/endpoint.go @@ -73,7 +73,7 @@ func (p *EndpointTestIntegration) startVarlink(useImageCache bool) { varlinkEndpoint := p.VarlinkEndpoint //p.SetVarlinkAddress(p.RemoteSocket) - args := []string{"varlink", "--timeout", "0", varlinkEndpoint} + args := []string{"varlink", "--time", "0", varlinkEndpoint} podmanOptions := getVarlinkOptions(p, args) if useImageCache { cacheOptions := []string{"--storage-opt", fmt.Sprintf("%s.imagestore=%s", p.ImageCacheFS, p.ImageCacheDir)} |