From 8ec08a426e7024d597281dc0af9168f340e10d5d Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Mon, 11 May 2020 12:07:42 -0500 Subject: v2 enable remote integration tests enable remote integration tests Signed-off-by: Brent Baude --- test/utils/utils.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'test/utils') 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 { -- cgit v1.2.3-54-g00ecf