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

Merge pull request #19034 from edsantiago/enable_rootless_systemd_test

Browse Source 
e2e: systemd test: major fixes
This commit is contained in:
OpenShift Merge Robot
2023-06-28 20:15:46 +02:00
committed by GitHub
parent 2ac2ba9e4f 8fb719a9e8
commit b2ce082df8
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/e2e/systemd_test.go
View File

@ -17,6 +17,7 @@ var _ = Describe("Podman systemd", func() {
var systemdUnitFile string var systemdUnitFile string
BeforeEach(func() { BeforeEach(func() {
podmanCmd := fmt.Sprintf("%s %s", podmanTest.PodmanBinary, strings.Join(podmanTest.MakeOptions(nil, false, false), " "))
systemdUnitFile = fmt.Sprintf(`[Unit] systemdUnitFile = fmt.Sprintf(`[Unit]
Description=redis container Description=redis container
[Service] [Service]
@ -26,19 +27,30 @@ ExecStop=%s stop -t 10 redis
KillMode=process KillMode=process
[Install] [Install]
WantedBy=default.target WantedBy=default.target
`, podmanTest.PodmanBinary, podmanTest.PodmanBinary) `, podmanCmd, podmanCmd)
}) })
It("podman start container by systemd", func() { It("podman start container by systemd", func() {
SkipIfRootless("rootless can not write to /etc") SkipIfRemote("cannot create unit file on remote host")
SkipIfContainerized("test does not have systemd as pid 1") SkipIfContainerized("test does not have systemd as pid 1")
sysFile := os.WriteFile("/etc/systemd/system/redis.service", []byte(systemdUnitFile), 0644) dashWhat := "--system"
unitDir := "/run/systemd/system"
if isRootless() {
dashWhat = "--user"
unitDir = fmt.Sprintf("%s/systemd/user", os.Getenv("XDG_RUNTIME_DIR"))
}
err := os.MkdirAll(unitDir, 0700)
Expect(err).ToNot(HaveOccurred())
serviceName := "redis-" + RandomString(10)
sysFilePath := filepath.Join(unitDir, serviceName+".service")
sysFile := os.WriteFile(sysFilePath, []byte(systemdUnitFile), 0644)
Expect(sysFile).ToNot(HaveOccurred()) Expect(sysFile).ToNot(HaveOccurred())
defer func() { defer func() {
stop := SystemExec("bash", []string{"-c", "systemctl stop redis"}) stop := SystemExec("systemctl", []string{dashWhat, "stop", serviceName})
os.Remove("/etc/systemd/system/redis.service") os.Remove(sysFilePath)
SystemExec("bash", []string{"-c", "systemctl daemon-reload"}) SystemExec("systemctl", []string{dashWhat, "daemon-reload"})
Expect(stop).Should(Exit(0)) Expect(stop).Should(Exit(0))
}() }()
@ -46,16 +58,16 @@ WantedBy=default.target
create.WaitWithDefaultTimeout() create.WaitWithDefaultTimeout()
Expect(create).Should(Exit(0)) Expect(create).Should(Exit(0))
enable := SystemExec("bash", []string{"-c", "systemctl daemon-reload"}) enable := SystemExec("systemctl", []string{dashWhat, "daemon-reload"})
Expect(enable).Should(Exit(0)) Expect(enable).Should(Exit(0))
start := SystemExec("bash", []string{"-c", "systemctl start redis"}) start := SystemExec("systemctl", []string{dashWhat, "start", serviceName})
Expect(start).Should(Exit(0)) Expect(start).Should(Exit(0))
logs := SystemExec("bash", []string{"-c", "journalctl -n 20 -u redis"}) logs := SystemExec("journalctl", []string{dashWhat, "-n", "20", "-u", serviceName})
Expect(logs).Should(Exit(0)) Expect(logs).Should(Exit(0))
status := SystemExec("bash", []string{"-c", "systemctl status redis"}) status := SystemExec("systemctl", []string{dashWhat, "status", serviceName})
Expect(status.OutputToString()).To(ContainSubstring("active (running)")) Expect(status.OutputToString()).To(ContainSubstring("active (running)"))
}) })