From 036fdfd2cbfad08ae723cbd1e90c8c6102cc67c2 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Fri, 27 Aug 2010 18:03:36 +0000 Subject: [PATCH] Behavior of newusers has changed regarding systeml users (allocation starting from the higest limit and going down). It makes more sens to pass this test with users alredy allocated that way. etc/passwd changed and data/passwd data/group changed to match the new request's results. --- .../config/etc/passwd | 2 +- .../49_multiple_system_users/data/group | 24 +++++++------- .../49_multiple_system_users/data/passwd | 32 +++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/newusers/49_multiple_system_users/config/etc/passwd b/tests/newusers/49_multiple_system_users/config/etc/passwd index a52d012b..a4907a14 100644 --- a/tests/newusers/49_multiple_system_users/config/etc/passwd +++ b/tests/newusers/49_multiple_system_users/config/etc/passwd @@ -16,6 +16,6 @@ list:x:38:38:Mailing List Manager:/var/list:/bin/sh irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false +Debian-exim:x:998:998::/var/spool/exim4:/bin/false foo:x:65535:65535:User Foo - Gecos Field::/bin/sh fooo:x:997:997:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/49_multiple_system_users/data/group b/tests/newusers/49_multiple_system_users/data/group index e7272d2c..d9abdaa7 100644 --- a/tests/newusers/49_multiple_system_users/data/group +++ b/tests/newusers/49_multiple_system_users/data/group @@ -41,19 +41,19 @@ crontab:x:101: Debian-exim:x:102: foo:x:65535:foo fooo:x:997: -foo1:x:999: -foo1a:x:998: +foo1:x:996: +foo1a:x:999: foo2:x:2000: -foo3:x:996: -foo4:x:995: +foo3:x:994: +foo4:x:998: foo5:x:3005: -foo6:x:994: +foo6:x:992: foo7:x:61000: -foo8:x:993: -foo9:x:992: -foo10:x:991: +foo8:x:991: +foo9:x:995: +foo10:x:990: foo11:x:63000: -foo12:x:990: -foo13:x:989: -foo14:x:988: -foo15:x:987: +foo12:x:988: +foo13:x:987: +foo14:x:993: +foo15:x:986: diff --git a/tests/newusers/49_multiple_system_users/data/passwd b/tests/newusers/49_multiple_system_users/data/passwd index 255b32c1..fb8a0751 100644 --- a/tests/newusers/49_multiple_system_users/data/passwd +++ b/tests/newusers/49_multiple_system_users/data/passwd @@ -16,23 +16,23 @@ list:x:38:38:Mailing List Manager:/var/list:/bin/sh irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false +Debian-exim:x:998:998::/var/spool/exim4:/bin/false foo:x:65535:65535:User Foo - Gecos Field::/bin/sh fooo:x:997:997:User Foo - Gecos Field::/bin/sh -foo1:x:999:999:User Foo - Gecos Field::/bin/sh -foo1a:x:999:998:User Foo - Gecos Field::/bin/sh -foo1b:x:998:998:User Foo - Gecos Field::/bin/sh +foo1:x:996:996:User Foo - Gecos Field::/bin/sh +foo1a:x:996:999:User Foo - Gecos Field::/bin/sh +foo1b:x:995:999:User Foo - Gecos Field::/bin/sh foo2:x:2000:2000:User Foo - Gecos Field::/bin/sh -foo3:x:996:996:User Foo - Gecos Field::/bin/sh -foo4:x:3000:995:User Foo - Gecos Field::/bin/sh -foo5:x:995:3005:User Foo - Gecos Field::/bin/sh -foo6:x:994:994:User Foo - Gecos Field::/bin/sh +foo3:x:994:994:User Foo - Gecos Field::/bin/sh +foo4:x:3000:998:User Foo - Gecos Field::/bin/sh +foo5:x:993:3005:User Foo - Gecos Field::/bin/sh +foo6:x:992:992:User Foo - Gecos Field::/bin/sh foo7:x:61000:61000:User Foo - Gecos Field::/bin/sh -foo8:x:993:993:User Foo - Gecos Field::/bin/sh -foo9:x:62000:992:User Foo - Gecos Field::/bin/sh -foo10:x:992:991:User Foo - Gecos Field::/bin/sh -foo11:x:991:63000:User Foo - Gecos Field::/bin/sh -foo12:x:990:990:User Foo - Gecos Field::/bin/sh -foo13:x:989:989:User Foo - Gecos Field::/bin/sh -foo14:x:59000:988:User Foo - Gecos Field::/bin/sh -foo15:x:988:987:User Foo - Gecos Field::/bin/sh +foo8:x:991:991:User Foo - Gecos Field::/bin/sh +foo9:x:62000:995:User Foo - Gecos Field::/bin/sh +foo10:x:990:990:User Foo - Gecos Field::/bin/sh +foo11:x:989:63000:User Foo - Gecos Field::/bin/sh +foo12:x:988:988:User Foo - Gecos Field::/bin/sh +foo13:x:987:987:User Foo - Gecos Field::/bin/sh +foo14:x:59000:993:User Foo - Gecos Field::/bin/sh +foo15:x:986:986:User Foo - Gecos Field::/bin/sh