From ae10f55362d1dfeacec2d10add1dffbceb0a31b9 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 8 Apr 2019 14:47:31 +0200
Subject: test: fix remote tests for rootless
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
test/e2e/libpod_suite_remoteclient_test.go | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
(limited to 'test')
diff --git a/test/e2e/libpod_suite_remoteclient_test.go b/test/e2e/libpod_suite_remoteclient_test.go
index 44c5edf07..a85d21a48 100644
--- a/test/e2e/libpod_suite_remoteclient_test.go
+++ b/test/e2e/libpod_suite_remoteclient_test.go
@@ -139,19 +139,21 @@ func (p *PodmanTestIntegration) CleanupVolume() {
}
func PodmanTestCreate(tempDir string) *PodmanTestIntegration {
- if os.Geteuid() != 0 {
- ginkgo.Skip("This function is not enabled for rootless podman")
- }
pti := PodmanTestCreateUtil(tempDir, true)
pti.StartVarlink()
return pti
}
func (p *PodmanTestIntegration) StartVarlink() {
- if _, err := os.Stat("/path/to/whatever"); os.IsNotExist(err) {
+ if os.Geteuid() == 0 {
os.MkdirAll("/run/podman", 0755)
}
- args := []string{"varlink", "--timeout", "0", "unix:/run/podman/io.podman"}
+ varlinkEndpoint := "unix:/run/podman/io.podman"
+ if addr := os.Getenv("PODMAN_VARLINK_ADDRESS"); addr != "" {
+ varlinkEndpoint = addr
+ }
+
+ args := []string{"varlink", "--timeout", "0", varlinkEndpoint}
podmanOptions := getVarlinkOptions(p, args)
command := exec.Command(p.PodmanBinary, podmanOptions...)
fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " "))
--
cgit v1.2.3-54-g00ecf