summaryrefslogtreecommitdiff
path: root/test/utils
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-05-11 12:07:42 -0500
committerBrent Baude <bbaude@redhat.com>2020-05-19 14:26:19 -0500
commit8ec08a426e7024d597281dc0af9168f340e10d5d (patch)
tree01dcb8b2a0cb42b0ed7869bf86e64a124d6ff4e6 /test/utils
parent9fe49335e0e9c11ab0b7148ba0c5d1426023d2fb (diff)
downloadpodman-8ec08a426e7024d597281dc0af9168f340e10d5d.tar.gz
podman-8ec08a426e7024d597281dc0af9168f340e10d5d.tar.bz2
podman-8ec08a426e7024d597281dc0af9168f340e10d5d.zip
v2 enable remote integration tests
enable remote integration tests Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'test/utils')
-rw-r--r--test/utils/utils.go11
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 {