5 files changed, 162 insertions, 0 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 55b9a8037..e4b854332 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -423,6 +423,20 @@ var _ = Describe("Podman generate systemd", func() {
 
 	})
 
+	It("podman generate systemd --container-prefix ''", func() {
+		n := podmanTest.Podman([]string{"create", "--name", "foo", "alpine", "top"})
+		n.WaitWithDefaultTimeout()
+		Expect(n).Should(Exit(0))
+
+		session := podmanTest.Podman([]string{"generate", "systemd", "--name", "--container-prefix", "", "foo"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+
+		// Grepping the output (in addition to unit tests)
+		Expect(session.OutputToString()).To(ContainSubstring("# foo.service"))
+
+	})
+
 	It("podman generate systemd --separator _", func() {
 		n := podmanTest.Podman([]string{"create", "--name", "foo", "alpine", "top"})
 		n.WaitWithDefaultTimeout()
@@ -485,6 +499,44 @@ var _ = Describe("Podman generate systemd", func() {
 		Expect(session.OutputToString()).To(ContainSubstring("BindsTo=p_foo.service"))
 	})
 
+	It("podman generate systemd pod --pod-prefix '' --container-prefix '' --separator _ change all prefixes/separator", func() {
+		n := podmanTest.Podman([]string{"pod", "create", "--name", "foo"})
+		n.WaitWithDefaultTimeout()
+		Expect(n).Should(Exit(0))
+
+		n = podmanTest.Podman([]string{"create", "--pod", "foo", "--name", "foo-1", "alpine", "top"})
+		n.WaitWithDefaultTimeout()
+		Expect(n).Should(Exit(0))
+
+		n = podmanTest.Podman([]string{"create", "--pod", "foo", "--name", "foo-2", "alpine", "top"})
+		n.WaitWithDefaultTimeout()
+		Expect(n).Should(Exit(0))
+
+		// test systemd generate with empty pod prefix
+		session1 := podmanTest.Podman([]string{"generate", "systemd", "--pod-prefix", "", "--name", "foo"})
+		session1.WaitWithDefaultTimeout()
+		Expect(session1).Should(Exit(0))
+
+		// Grepping the output (in addition to unit tests)
+		Expect(session1.OutputToString()).To(ContainSubstring("# foo.service"))
+		Expect(session1.OutputToString()).To(ContainSubstring("Requires=container-foo-1.service container-foo-2.service"))
+		Expect(session1.OutputToString()).To(ContainSubstring("# container-foo-1.service"))
+		Expect(session1.OutputToString()).To(ContainSubstring("BindsTo=foo.service"))
+
+		// test systemd generate with empty container and pod prefix
+		session2 := podmanTest.Podman([]string{"generate", "systemd", "--container-prefix", "", "--pod-prefix", "", "--separator", "_", "--name", "foo"})
+		session2.WaitWithDefaultTimeout()
+		Expect(session2).Should(Exit(0))
+
+		// Grepping the output (in addition to unit tests)
+		Expect(session2.OutputToString()).To(ContainSubstring("# foo.service"))
+		Expect(session2.OutputToString()).To(ContainSubstring("Requires=foo-1.service foo-2.service"))
+		Expect(session2.OutputToString()).To(ContainSubstring("# foo-1.service"))
+		Expect(session2.OutputToString()).To(ContainSubstring("# foo-2.service"))
+		Expect(session2.OutputToString()).To(ContainSubstring("BindsTo=foo.service"))
+
+	})
+
 	It("podman generate systemd pod with containers --new", func() {
 		tmpDir, err := ioutil.TempDir("", "")
 		Expect(err).To(BeNil())
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index ccd7c771e..cf81a0348 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -1,3 +1,4 @@
+//go:build !remote
 // +build !remote
 
 package integration
diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go
index 849ba7162..96785c569 100644
--- a/test/e2e/play_build_test.go
+++ b/test/e2e/play_build_test.go
@@ -1,3 +1,4 @@
+//go:build !remote
 // +build !remote
 
 // build for play kube is not supported on remote yet.
diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go
index e6526217a..64a01deb7 100644
--- a/test/e2e/run_apparmor_test.go
+++ b/test/e2e/run_apparmor_test.go
@@ -1,3 +1,4 @@
+//go:build !remote
 // +build !remote
 
 package integration
diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go
new file mode 100644
index 000000000..d5434868d
--- /dev/null
+++ b/test/e2e/systemd_activate_test.go
@@ -0,0 +1,107 @@
+package integration
+
+import (
+	"errors"
+	"fmt"
+	"io/fs"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"syscall"
+	"time"
+
+	testUtils "github.com/containers/podman/v4/test/utils"
+	podmanUtils "github.com/containers/podman/v4/utils"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
+)
+
+var _ = Describe("Systemd activate", func() {
+	var tempDir string
+	var err error
+	var podmanTest *PodmanTestIntegration
+
+	BeforeEach(func() {
+		tempDir, err = testUtils.CreateTempDirInTempDir()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			os.Exit(1)
+		}
+
+		podmanTest = PodmanTestCreate(tempDir)
+		podmanTest.Setup()
+		podmanTest.SeedImages()
+	})
+
+	AfterEach(func() {
+		podmanTest.Cleanup()
+		processTestResult(CurrentGinkgoTestDescription())
+	})
+
+	It("stop podman.service", func() {
+		SkipIfRemote("Testing stopped service requires both podman and podman-remote binaries")
+
+		activate, err := exec.LookPath("systemd-socket-activate")
+		if err != nil {
+			activate = "/usr/bin/systemd-socket-activate"
+		}
+		stat, err := os.Stat(activate)
+		switch {
+		case errors.Is(err, fs.ErrNotExist):
+			Skip(activate + " required for systemd activation tests")
+		case stat.Mode()&0111 == 0:
+			Skip("Unable to execute " + activate)
+		case err != nil:
+			Skip(err.Error())
+		}
+
+		// systemd-socket-activate does not support DNS lookups
+		host := "127.0.0.1"
+		port, err := podmanUtils.GetRandomPort()
+		Expect(err).ToNot(HaveOccurred())
+
+		activateSession := testUtils.StartSystemExec(activate, []string{
+			fmt.Sprintf("--listen=%s:%d", host, port),
+			podmanTest.PodmanBinary,
+			"--root=" + filepath.Join(tempDir, "server_root"),
+			"system", "service",
+			"--time=0",
+		})
+		Expect(activateSession.Exited).ShouldNot(Receive(), "Failed to start podman service")
+
+		// Curried functions for specialized podman calls
+		podmanRemote := func(args ...string) *testUtils.PodmanSession {
+			args = append([]string{"--url", fmt.Sprintf("tcp://%s:%d", host, port)}, args...)
+			return testUtils.SystemExec(podmanTest.RemotePodmanBinary, args)
+		}
+
+		podman := func(args ...string) *testUtils.PodmanSession {
+			args = append([]string{"--root", filepath.Join(tempDir, "server_root")}, args...)
+			return testUtils.SystemExec(podmanTest.PodmanBinary, args)
+		}
+
+		containerName := "top_" + testUtils.RandomString(8)
+		apiSession := podmanRemote(
+			"create", "--tty", "--name", containerName, "--entrypoint", "top",
+			"quay.io/libpod/alpine_labels:latest",
+		)
+		Expect(apiSession).Should(Exit(0))
+
+		apiSession = podmanRemote("start", containerName)
+		Expect(apiSession).Should(Exit(0))
+
+		apiSession = podmanRemote("inspect", "--format={{.State.Running}}", containerName)
+		Expect(apiSession).Should(Exit(0))
+		Expect(apiSession.OutputToString()).To(Equal("true"))
+
+		// Emulate 'systemd stop podman.service'
+		activateSession.Signal(syscall.SIGTERM)
+		time.Sleep(2)
+		Eventually(activateSession).Should(Exit(0))
+
+		abiSession := podman("inspect", "--format={{.State.Running}}", containerName)
+		Expect(abiSession).To(Exit(0))
+		Expect(abiSession.OutputToString()).To(Equal("true"))
+	})
+})