diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-18 14:17:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 14:17:41 -0700 |
| commit | e4947e5fd699f584cb815a4f4fd92f22b62f2c8a (patch) | |
| tree | 525468fc942fcf473ad1df3722bbf05ea03f3c7b /test/utils | |
| parent | 4d45f5180f778bf3a298bf061ca2c0dba0d4bfad (diff) | |
| parent | 55e630e7876557ebd2a44e81fa357aab9efbb793 (diff) | |
| download | podman-e4947e5fd699f584cb815a4f4fd92f22b62f2c8a.tar.gz podman-e4947e5fd699f584cb815a4f4fd92f22b62f2c8a.tar.bz2 podman-e4947e5fd699f584cb815a4f4fd92f22b62f2c8a.zip | |
Merge pull request #2948 from baude/remotepause
podman-remote pause|unpause
Diffstat (limited to 'test/utils')
| -rw-r--r-- | test/utils/utils.go | 6 |
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 { |