1 files changed, 46 insertions, 0 deletions
diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go
index 85aeb92b8..eab2c2e67 100644
--- a/pkg/systemd/generate/containers_test.go
+++ b/pkg/systemd/generate/containers_test.go
@@ -1,6 +1,7 @@
 package generate
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/containers/podman/v3/pkg/domain/entities"
@@ -1036,3 +1037,48 @@ WantedBy=multi-user.target default.target
 		})
 	}
 }
+
+func TestSetContainerNameForTemplate(t *testing.T) {
+	tt := []struct {
+		name         string
+		startCommand []string
+		info         *containerInfo
+		expected     []string
+		err          error
+	}{
+		{
+			name:         "no name argument is set",
+			startCommand: []string{"/usr/bin/podman", "run", "busybox", "top"},
+			info:         &containerInfo{ServiceName: "container-122"},
+			expected:     []string{"/usr/bin/podman", "run", "--name=container-122-%i", "busybox", "top"},
+			err:          nil,
+		},
+		{
+			name:         "--name=value is used in arguments",
+			startCommand: []string{"/usr/bin/podman", "run", "--name=lovely_james", "busybox", "top"},
+			info:         &containerInfo{},
+			expected:     []string{"/usr/bin/podman", "run", "--name=lovely_james-%i", "busybox", "top"},
+			err:          nil,
+		},
+		{
+			name:         "--name value is used in arguments",
+			startCommand: []string{"/usr/bin/podman", "run", "--name", "lovely_james", "busybox", "top"},
+			info:         &containerInfo{},
+			expected:     []string{"/usr/bin/podman", "run", "--name", "lovely_james-%i", "busybox", "top"},
+			err:          nil,
+		},
+		{
+			name:         "--name value is used in arguments",
+			startCommand: []string{"/usr/bin/podman", "create", "busybox", "top"},
+			info:         &containerInfo{},
+			expected:     []string{"/usr/bin/podman", "create", "busybox", "top"},
+			err:          fmt.Errorf("\"run\" is missing in the command arguments"),
+		},
+	}
+
+	for _, te := range tt {
+		res, err := setContainerNameForTemplate(te.startCommand, te.info)
+		assert.Equal(t, te.err, err)
+		assert.Equal(t, te.expected, res)
+	}
+}