From d3286952e6f99b3c1f8ba177d8caddc9544adea4 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Fri, 3 May 2019 13:28:40 -0400
Subject: Try and fix restart-policy tests
Theory: it's SELinux blowing up and preventing us from creating
files as the container. Try and use a fresh dir and :Z to fix.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
test/e2e/run_test.go | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 0c1cda0a2..030722b47 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -725,15 +725,19 @@ USER mail`
It("podman run with restart-policy always restarts containers", func() {
podmanTest.RestoreArtifact(fedoraMinimal)
- aliveFile := filepath.Join(podmanTest.RunRoot, "running")
+ testDir := filepath.Join(podmanTest.RunRoot, "restart-test")
+ err := os.Mkdir(testDir, 0755)
+ Expect(err).To(BeNil())
+
+ aliveFile := filepath.Join(testDir, "running")
file, err := os.Create(aliveFile)
Expect(err).To(BeNil())
file.Close()
- session := podmanTest.Podman([]string{"run", "-dt", "--restart", "always", "-v", fmt.Sprintf("%s:/tmp/runroot", podmanTest.RunRoot), fedoraMinimal, "bash", "-c", "date +%N > /tmp/runroot/ran && while test -r /tmp/runroot/running; do sleep 0.1s; done"})
+ session := podmanTest.Podman([]string{"run", "-dt", "--restart", "always", "-v", fmt.Sprintf("%s:/tmp/runroot:Z", testDir), fedoraMinimal, "bash", "-c", "date +%N > /tmp/runroot/ran && while test -r /tmp/runroot/running; do sleep 0.1s; done"})
found := false
- testFile := filepath.Join(podmanTest.RunRoot, "ran")
+ testFile := filepath.Join(testDir, "ran")
for i := 0; i < 10; i++ {
time.Sleep(1 * time.Second)
if _, err := os.Stat(testFile); err == nil {
--
cgit v1.2.3-54-g00ecf