Fix SystemExec completion race

Some callers assume when SystemExec returns, the command has completed.
Other callers explicitly wait for completion (as required).  However,
forgetting to do that is an incredibly easy mistake to make.  Fix this
by adding an explicit parameter to the function.  This requires
every caller to deliberately state whether or not a completion-check
is required.

Also address **many** resource naming / cleanup completion-races.

Signed-off-by: Chris Evich <cevich@redhat.com>

1 files changed, 9 insertions, 13 deletions

diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
index a7e7a1500..252361288 100644
--- a/test/e2e/systemd_test.go
+++ b/test/e2e/systemd_test.go
@@ -53,31 +53,27 @@ WantedBy=multi-user.target
 
 		sys_file := ioutil.WriteFile("/etc/systemd/system/redis.service", []byte(systemd_unit_file), 0644)
 		Expect(sys_file).To(BeNil())
+		defer func() {
+			stop := SystemExec("bash", []string{"-c", "systemctl stop redis"})
+			os.Remove("/etc/systemd/system/redis.service")
+			SystemExec("bash", []string{"-c", "systemctl daemon-reload"})
+			Expect(stop.ExitCode()).To(Equal(0))
+		}()
 
 		create := podmanTest.Podman([]string{"create", "-d", "--name", "redis", "redis"})
 		create.WaitWithDefaultTimeout()
 		Expect(create.ExitCode()).To(Equal(0))
 
-		enable := SystemExec("bash", []string{"-c", "systemctl daemon-reload && systemctl enable --now redis"})
-		enable.WaitWithDefaultTimeout()
+		enable := SystemExec("bash", []string{"-c", "systemctl daemon-reload"})
 		Expect(enable.ExitCode()).To(Equal(0))
 
 		start := SystemExec("bash", []string{"-c", "systemctl start redis"})
-		start.WaitWithDefaultTimeout()
+		Expect(start.ExitCode()).To(Equal(0))
 
 		logs := SystemExec("bash", []string{"-c", "journalctl -n 20 -u redis"})
-		logs.WaitWithDefaultTimeout()
+		Expect(logs.ExitCode()).To(Equal(0))
 
 		status := SystemExec("bash", []string{"-c", "systemctl status redis"})
-		status.WaitWithDefaultTimeout()
 		Expect(status.OutputToString()).To(ContainSubstring("active (running)"))
-
-		cleanup := SystemExec("bash", []string{"-c", "systemctl stop redis && systemctl disable redis"})
-		cleanup.WaitWithDefaultTimeout()
-		Expect(cleanup.ExitCode()).To(Equal(0))
-		os.Remove("/etc/systemd/system/redis.service")
-		sys_clean := SystemExec("bash", []string{"-c", "systemctl daemon-reload"})
-		sys_clean.WaitWithDefaultTimeout()
-		Expect(sys_clean.ExitCode()).To(Equal(0))
 	})
 })