diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-20 01:45:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 01:45:00 +0200 |
| commit | 4eee0d840f0af81560d89864ea64b95c9e70b18d (patch) | |
| tree | 684b0400d186ef9f6c20314a951f10ecec185bae /test/utils/utils.go | |
| parent | 0f8ad039235137d086b9fea33bb74b362e625cdd (diff) | |
| parent | 8ec08a426e7024d597281dc0af9168f340e10d5d (diff) | |
| download | podman-4eee0d840f0af81560d89864ea64b95c9e70b18d.tar.gz podman-4eee0d840f0af81560d89864ea64b95c9e70b18d.tar.bz2 podman-4eee0d840f0af81560d89864ea64b95c9e70b18d.zip | |
Merge pull request #6177 from baude/v2enableremote
v2 enable remote integration tests
Diffstat (limited to 'test/utils/utils.go')
| -rw-r--r-- | test/utils/utils.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go index 0131e023d..1d59e5468 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -39,9 +39,9 @@ type PodmanTest struct { TempDir string RemoteTest bool RemotePodmanBinary string - VarlinkSession *os.Process - VarlinkEndpoint string - VarlinkCommand *exec.Cmd + RemoteSession *os.Process + RemoteSocket string + RemoteCommand *exec.Cmd ImageCacheDir string ImageCacheFS string } @@ -71,9 +71,10 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string podmanBinary := p.PodmanBinary if p.RemoteTest { podmanBinary = p.RemotePodmanBinary - env = append(env, fmt.Sprintf("PODMAN_VARLINK_ADDRESS=%s", p.VarlinkEndpoint)) } - + if p.RemoteTest { + podmanOptions = append([]string{"--remote", p.RemoteSocket}, podmanOptions...) + } if env == nil { fmt.Printf("Running: %s %s\n", podmanBinary, strings.Join(podmanOptions, " ")) } else { |