containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17378 from mheon/fix_17366 

Fix a potential UID/GID collision in unit tests
This commit is contained in:
OpenShift Merge Robot 2023-02-07 12:00:40 -05:00 committed by GitHub
parent 6ce76720be 1916da5962
commit db505ed5dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/container_internal_linux_test.go
View File

@ -15,7 +15,7 @@ func TestGenerateUserPasswdEntry(t *testing.T) {
config: &ContainerConfig{ config: &ContainerConfig{
Spec: &spec.Spec{}, Spec: &spec.Spec{},
ContainerSecurityConfig: ContainerSecurityConfig{ ContainerSecurityConfig: ContainerSecurityConfig{
User: "123:456", User: "123456:456789",
}, },
}, },
state: &ContainerState{ state: &ContainerState{
@ -26,14 +26,14 @@ func TestGenerateUserPasswdEntry(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assert.Equal(t, user, "123:*:123:456:container user:/:/bin/sh\n") assert.Equal(t, user, "123456:*:123456:456789:container user:/:/bin/sh\n")
c.config.User = "567" c.config.User = "567890"
user, err = c.generateUserPasswdEntry(0) user, err = c.generateUserPasswdEntry(0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assert.Equal(t, user, "567:*:567:0:container user:/:/bin/sh\n") assert.Equal(t, user, "567890:*:567890:0:container user:/:/bin/sh\n")
} }
func TestGenerateUserGroupEntry(t *testing.T) { func TestGenerateUserGroupEntry(t *testing.T) {
@ -41,7 +41,7 @@ func TestGenerateUserGroupEntry(t *testing.T) {
config: &ContainerConfig{ config: &ContainerConfig{
Spec: &spec.Spec{}, Spec: &spec.Spec{},
ContainerSecurityConfig: ContainerSecurityConfig{ ContainerSecurityConfig: ContainerSecurityConfig{
User: "123:456", User: "123456:456789",
}, },
}, },
state: &ContainerState{ state: &ContainerState{
@ -52,12 +52,12 @@ func TestGenerateUserGroupEntry(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assert.Equal(t, group, "456:x:456:123\n") assert.Equal(t, group, "456789:x:456789:123456\n")
c.config.User = "567" c.config.User = "567890"
group, err = c.generateUserGroupEntry(0) group, err = c.generateUserGroupEntry(0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assert.Equal(t, group, "567:x:567:567\n") assert.Equal(t, group, "567890:x:567890:567890\n")
} }