opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try and fix restart-policy tests

Browse Source 
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>
This commit is contained in:
Matthew Heon
2019-05-03 13:28:40 -04:00
parent ceaaed7810
commit d3286952e6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/run_test.go
View File

@ -725,15 +725,19 @@ USER mail`
It("podman run with restart-policy always restarts containers", func() { It("podman run with restart-policy always restarts containers", func() {
podmanTest.RestoreArtifact(fedoraMinimal) 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) file, err := os.Create(aliveFile)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
file.Close() 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 found := false
testFile := filepath.Join(podmanTest.RunRoot, "ran") testFile := filepath.Join(testDir, "ran")
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
if _, err := os.Stat(testFile); err == nil { if _, err := os.Stat(testFile); err == nil {