summaryrefslogtreecommitdiff
path: root/test/utils
diff options
context:
space:
mode:
Diffstat (limited to 'test/utils')
-rw-r--r--test/utils/utils.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go
index 6308197b8..1e0391d2e 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -4,6 +4,7 @@ import (
"bufio"
"encoding/json"
"fmt"
+ "github.com/containers/libpod/pkg/rootless"
"io/ioutil"
"os"
"os/exec"
@@ -40,6 +41,7 @@ type PodmanTest struct {
RemoteTest bool
RemotePodmanBinary string
VarlinkSession *os.Process
+ VarlinkEndpoint string
}
// PodmanSession wraps the gexec.session so we can extend it
@@ -67,7 +69,11 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string
podmanBinary := p.PodmanBinary
if p.RemoteTest {
podmanBinary = p.RemotePodmanBinary
+ if !rootless.IsRootless() {
+ env = append(env, fmt.Sprintf("PODMAN_VARLINK_ADDRESS=%s", p.VarlinkEndpoint))
+ }
}
+
if env == nil {
fmt.Printf("Running: %s %s\n", podmanBinary, strings.Join(podmanOptions, " "))
} else {