From f7d972a70f91a85a5630186e448e7012dc0b8c53 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Sat, 10 Nov 2018 21:49:33 +0100
Subject: test: fix test for NOTIFY_SOCKET
do not make any assumption on the path inside of the container.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
test/e2e/run_test.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'test/e2e')
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 4ed1fbed7..85f8df246 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -292,8 +292,7 @@ var _ = Describe("Podman run", func() {
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "NOTIFY_SOCKET"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- match, _ := session.GrepString(sock)
- Expect(match).Should(BeTrue())
+ Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 0))
os.Unsetenv("NOTIFY_SOCKET")
})
--
cgit v1.2.3-54-g00ecf
From 180d0c6f62af8fb18da2ddb0e929392ae3d389e6 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 28 Nov 2018 12:46:39 +0100
Subject: tests: fix NOTIFY_SOCKET test
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
test/e2e/run_test.go | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
(limited to 'test/e2e')
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 85f8df246..38504828b 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -3,6 +3,7 @@ package integration
import (
"fmt"
"io/ioutil"
+ "net"
"os"
"path/filepath"
"strings"
@@ -287,13 +288,27 @@ var _ = Describe("Podman run", func() {
})
It("podman run notify_socket", func() {
- sock := "/run/notify"
+ host := GetHostDistributionInfo()
+ if host.Distribution != "rhel" && host.Distribution != "centos" && host.Distribution != "fedora" {
+ Skip("this test requires a working runc")
+ }
+ sock := filepath.Join(podmanTest.TempDir, "notify")
+ addr := net.UnixAddr{
+ Name: sock,
+ Net: "unixgram",
+ }
+ socket, err := net.ListenUnixgram("unixgram", &addr)
+ Expect(err).To(BeNil())
+ defer os.Remove(sock)
+ defer socket.Close()
+
os.Setenv("NOTIFY_SOCKET", sock)
+ defer os.Unsetenv("NOTIFY_SOCKET")
+
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "NOTIFY_SOCKET"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 0))
- os.Unsetenv("NOTIFY_SOCKET")
})
It("podman run log-opt", func() {
--
cgit v1.2.3-54-g00ecf