diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-22 20:14:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 20:14:19 +0200 |
| commit | 4bc819328b898f57fa7c40d7d5f8dc5583ef5eef (patch) | |
| tree | 7e55e6dbe5037ca446cea38cf398bcf63e8ba4d5 /test/e2e | |
| parent | c8d64264c924833440237bf766a05db0cea56a1c (diff) | |
| parent | e41089244b300af2b3e51ac1e9501b4cfe42264e (diff) | |
| download | podman-4bc819328b898f57fa7c40d7d5f8dc5583ef5eef.tar.gz podman-4bc819328b898f57fa7c40d7d5f8dc5583ef5eef.tar.bz2 podman-4bc819328b898f57fa7c40d7d5f8dc5583ef5eef.zip | |
Merge pull request #6341 from rhatdan/build6
Attempt to turn on additional build tests
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/libpod_suite_remote_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/libpod_suite_varlink_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
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, " ")) |