Author: jsuchome Date: Wed Aug 22 10:48:56 2007 New Revision: 40391 URL: http://svn.opensuse.org/viewcvs/yast?rev=40391&view=rev Log: reenabled more tests Added: trunk/users/testsuite/tests/Import.ycp - copied, changed from r40377, trunk/users/testsuite/tests/Import.ycp.disabled trunk/users/testsuite/tests/Read.ycp - copied, changed from r40377, trunk/users/testsuite/tests/Read.ycp.disabled trunk/users/testsuite/tests/SelectUser.ycp - copied, changed from r40377, trunk/users/testsuite/tests/SelectUser.ycp.disabled trunk/users/testsuite/tests/YaPIGroupAdd.ycp - copied, changed from r40377, trunk/users/testsuite/tests/YaPIGroupAdd.ycp.disabled Removed: trunk/users/testsuite/tests/Import.ycp.disabled trunk/users/testsuite/tests/Read.ycp.disabled trunk/users/testsuite/tests/SelectUser.ycp.disabled trunk/users/testsuite/tests/YaPIGroupAdd.ycp.disabled Modified: trunk/users/testsuite/tests/EditUser.out trunk/users/testsuite/tests/EditUser.ycp trunk/users/testsuite/tests/Import.out trunk/users/testsuite/tests/Read.out trunk/users/testsuite/tests/SelectUser.out trunk/users/testsuite/tests/YaPIGroupAdd.out Modified: trunk/users/testsuite/tests/EditUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.out?rev=40391&r1=40390&r2=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/EditUser.out (original) +++ trunk/users/testsuite/tests/EditUser.out Wed Aug 22 10:48:56 2007 @@ -11,6 +11,7 @@ Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Return +Return nil Dump ---- user 'hh': Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] Execute .target.bash_output "grep '^volume hh ' /etc/security/pam_mount.conf | sed -e 's/- //' | cut -f 4 -d ' '" $[] @@ -36,8 +37,10 @@ Execute .target.bash "/usr/sbin/nscd -i passwd" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return +Return nil Dump ---- user 500: Dump $[] +Return nil Dump ---- user 501: Dump $["addit_data":"", "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"heslo", "what":"edit_user"] Execute .target.bash_output "grep '^volume hh ' /etc/security/pam_mount.conf | sed -e 's/- //' | cut -f 4 -d ' '" $["stdout":"hh"] Modified: trunk/users/testsuite/tests/EditUser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.ycp?rev=40391&r1=40390&r2=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/EditUser.ycp (original) +++ trunk/users/testsuite/tests/EditUser.ycp Wed Aug 22 10:48:56 2007 @@ -1,16 +1,10 @@ /** - * File: - * AddGroup.ycp - * - * Module: - * Users configurator - * - * Summary: - * Saving group tests. - * - * Authors: - * Jiri Suchomel + * File : EditUser.ycp + * Module : Users configurator + * Summary : Test of Users::EditUser function + * Author : Jiri Suchomel * + * $Id$ */ { @@ -86,7 +80,7 @@ // for home directory checks READ["target","stat","isdir"] = true; - Users::SelectUserByName ("hh"); + Testsuite::Test (``(Users::SelectUserByName ("hh")), [], 0); Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ())); @@ -112,10 +106,10 @@ // home changed its owner because of uid change Testsuite::Test (``(Users::Write ()), [RW, WRITE, EXEC], 0); - Users::SelectUser (500); + Testsuite::Test (``(Users::SelectUser (500)), [], 0); Testsuite::Dump (sformat ("---- user 500:\n %1", Users::GetCurrentUser ())); - Users::SelectUser (501); + Testsuite::Test (``(Users::SelectUser (501)), [], 0); Testsuite::Dump (sformat ("---- user 501:\n %1", Users::GetCurrentUser ())); changes = $[ Modified: trunk/users/testsuite/tests/Import.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/Import.out?rev=40391&r1=40390&r2=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/Import.out (original) +++ trunk/users/testsuite/tests/Import.out Wed Aug 22 10:48:56 2007 @@ -1,3 +1,5 @@ +Dump local user names: +Dump [] Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -5,40 +7,11 @@ Read .etc.default.useradd."inactive" 0 Read .etc.default.useradd."shell" 0 Read .etc.default.useradd."skel" 0 -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[], "hh":$[], "homes":$[], "uids":$[], "usernames":$[]] -Read .passwd.local.users.by_uidnumber $[] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[], "homes":$[], "uids":$[], "usernames":$[]] -Read .passwd.system.users.by_uidnumber $[] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[], "gids":$[], "groupnames":$[]] -Read .passwd.system.groups.by_gidnumber $[] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $[] -Read .passwd.system.users.uids $[] -Read .passwd.local.users.last_uid 0 -Read .passwd.local.users.homes $[] -Read .passwd.local.users.usernames $[] -Read .passwd.local.users.uids $[] Execute .target.bash_output "echo 'ggg' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"ggg"] Read .target.string "/etc/shells" "" -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $[] -Read .passwd.system.users.uids $[] -Read .passwd.system.groups.gids $[] -Read .passwd.system.groups.groupnames $[] -Read .passwd.local.users.last_uid 0 -Read .passwd.local.users.homes $[] -Read .passwd.local.users.usernames $[] -Read .passwd.local.users.uids $[] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] Return true +Dump local user names: +Dump ["ggg", "hh", "ii"] +Return nil +Dump ---- user 'ggg': +Dump $["cn":"", "create_home":true, "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/ggg", "loginshell":"", "modified":"added", "org_homedirectory":"/home/ggg", "org_uid":"ggg", "org_uidnumber":"1000", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"ggg", "uidnumber":"1000", "userpassword":"crypted_password", "what":"add_user"] Copied: trunk/users/testsuite/tests/Import.ycp (from r40377, trunk/users/testsuite/tests/Import.ycp.disabled) URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/Import.ycp?p2=trunk/users/testsuite/tests/Import.ycp&p1=trunk/users/testsuite/tests/Import.ycp.disabled&r1=40377&r2=40391&rev=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/Import.ycp.disabled (original) +++ trunk/users/testsuite/tests/Import.ycp Wed Aug 22 10:48:56 2007 @@ -13,58 +13,17 @@ import "Mode"; import "Directory"; import "Progress"; + + string tmpdir = Directory::tmpdir; + foreach (string file, [ "passwd", "group", "shadow" ], { + SCR::Execute (.target.bash, sformat ("/bin/cp ./%1 %2/", file, tmpdir)); + }); + Users::SetBaseDirectory (tmpdir); + Users::ReadLocal (); + import "Testsuite"; map READ = $[ - "passwd": $[ - "local": $[ - "users": $[ - "hh": $[ - ], - "by_uidnumber": $[ - ], - "homes": $[ - ], - "usernames": $[ - ], - "uids": $[ - ] - ], - "shadow": $[ - ], - "groups": $[ - "users": $[ - "cn": "users", - ], - "by_gidnumber": $[ - 100 : $["users":1], - ], - "gids": $[ - 100: 1, - ], - "groupnames": $[ - "users": 1, - ] - ], - ], - "system": $[ - "users": $[ - "by_uidnumber": $[ - ], - "homes": $[], - "usernames": $[], - "uids": $[], - ], - "shadow": $[ - ], - "groups": $[ - "by_gidnumber": $[ - ], - "gids": $[ ], - "groupnames": $[ ] - ], - ], - ], "etc" : $[ "fstab": [], "cryptotab": [], @@ -116,9 +75,18 @@ "users" : [ $[ "username" : "ggg", + "user_password" : "password" ], ], ]; + Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local"))); + Testsuite::Test (``(Users::Import (importing)), [READ,WRITE,EXEC], 0); + + Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local"))); + + Testsuite::Test (``(Users::SelectUserByName ("ggg")), [], 0); + + Testsuite::Dump (sformat ("---- user 'ggg':\n %1", Users::GetCurrentUser ())); } Modified: trunk/users/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/Read.out?rev=40391&r1=40390&r2=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/Read.out (original) +++ trunk/users/testsuite/tests/Read.out Wed Aug 22 10:48:56 2007 @@ -10,31 +10,11 @@ Read .etc.nsswitch_conf.passwd 0 Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[500:$["hh":1, "hh2":1]], "hh":$["uid":"hh", "uidnumber":500], "hh2":$["uid":"hh2", "uidnumber":500], "homes":$["/home/hh":1], "last_uid":500, "uids":$[500:2], "usernames":$["hh":1, "hh2":1]] -Read .passwd.local.users.by_uidnumber $[500:$["hh":1, "hh2":1]] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[], "homes":$[], "last_uid":0, "uids":$[], "usernames":$[]] -Read .passwd.system.users.by_uidnumber $[] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[], "gids":$[], "groupnames":$[]] -Read .passwd.system.groups.by_gidnumber $[] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.local.users.last_uid 500 -Read .passwd.local.users.homes $["/home/hh":1] -Read .passwd.local.users.usernames $["hh":1, "hh2":1] -Read .passwd.local.users.uids $[500:2] -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $[] -Read .passwd.system.users.uids $[] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] -Read .passwd.system.groups.gids $[] -Read .passwd.system.groups.groupnames $[] Return +Return nil +Dump ---- user hh: +Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] +Return nil +Dump ---- user hh2: +Dump $["addit_data":"", "cn":"HaHa2", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh2", "loginshell":"/bin/bash", "type":"local", "uid":"hh2", "uidnumber":"500", "userpassword":nil] Dump ========================================================== Copied: trunk/users/testsuite/tests/Read.ycp (from r40377, trunk/users/testsuite/tests/Read.ycp.disabled) URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/Read.ycp?p2=trunk/users/testsuite/tests/Read.ycp&p1=trunk/users/testsuite/tests/Read.ycp.disabled&r1=40377&r2=40391&rev=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/Read.ycp.disabled (original) +++ trunk/users/testsuite/tests/Read.ycp Wed Aug 22 10:48:56 2007 @@ -1,22 +1,13 @@ /** - * File: - * AddGroup.ycp - * - * Module: - * Users configurator - * - * Summary: - * Saving group tests. - * - * Authors: - * Jiri Suchomel - * + * File : Read.ycp + * Module : Users configurator + * Summary : Test of Users::Read + * Authors : Jiri Suchomel */ { // testedfiles: Users.pm - include "testsuite.ycp"; import "Users"; import "UsersCache"; import "Mode"; @@ -24,69 +15,18 @@ import "Progress"; import "Report"; + string tmpdir = Directory::tmpdir; + foreach (string file, [ "passwd", "group", "shadow" ], { + SCR::Execute (.target.bash, sformat ("/bin/cp ./%1 %2/", file, tmpdir)); + if (file == "passwd") + SCR::Execute (.target.bash, sformat ("echo \"hh2:x:500:100:HaHa2:/home/hh2:/bin/bash\" >> %1/passwd", tmpdir)); + }); + Users::SetBaseDirectory (tmpdir); + Users::ReadLocal (); + + import "Testsuite"; + map READ = $[ - "passwd": $[ - "local": $[ - "users": $[ - "hh": $[ - "uid" : "hh", - "uidnumber" : 500 - ], - "hh2": $[ - "uid" : "hh2", - "uidnumber" : 500 - ], - "by_uidnumber": $[ - 500 : $["hh":1, "hh2" : 1], - ], - "last_uid": 500, - "homes": $[ - "/home/hh": 1, - ], - "usernames": $[ - "hh": 1, - "hh2": 1, - ], - "uids": $[ - 500: 2, - ] - ], - "shadow": $[ - ], - "groups": $[ - "users": $[ - "cn": "users", - ], - "by_gidnumber": $[ - 100 : $["users":1], - ], - "gids": $[ - 100: 1, - ], - "groupnames": $[ - "users": 1, - ] - ], - ], - "system": $[ - "users": $[ - "by_uidnumber": $[ - ], - "last_uid": 0, - "homes": $[], - "usernames": $[], - "uids": $[], - ], - "shadow": $[ - ], - "groups": $[ - "by_gidnumber": $[ - ], - "gids": $[ ], - "groupnames": $[ ] - ], - ], - ], "etc" : $[ "fstab": [], "cryptotab": [], @@ -121,11 +61,17 @@ ], ]; - DUMP ("=========================================================="); + Testsuite::Dump ("=========================================================="); Mode::SetTest ("test"); - TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0); + Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0); + + Testsuite::Test (``(Users::SelectUserByName ("hh")), [], 0); + Testsuite::Dump (sformat ("---- user hh:\n %1", Users::GetCurrentUser ())); + + Testsuite::Test (``(Users::SelectUserByName ("hh2")), [], 0); + Testsuite::Dump (sformat ("---- user hh2:\n %1", Users::GetCurrentUser ())); - DUMP ("=========================================================="); + Testsuite::Dump ("=========================================================="); } Modified: trunk/users/testsuite/tests/SelectUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/SelectUser.out?rev=40391&r1=40390&r2=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/SelectUser.out (original) +++ trunk/users/testsuite/tests/SelectUser.out Wed Aug 22 10:48:56 2007 @@ -10,40 +10,14 @@ Read .etc.nsswitch_conf.passwd 0 Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[500:$["hh":1]], "hh":$["homedirectory":"/home/hh", "loginshell":"/bin/bash", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":500], "homes":$["/home/hh":1], "last_uid":500, "uids":$[500:1], "usernames":$["hh":1]] -Read .passwd.local.users.by_uidnumber $[500:$["hh":1]] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[0:$["root":1], 51:$["suser":1]], "homes":$[], "last_uid":0, "root":$["uid":"root", "uidnumber":0], "suser":$["type":"system", "uid":"suser", "uidnumber":51], "uids":$[0:1, 51:1], "usernames":$["root":1, "suser":1]] -Read .passwd.system.users.by_uidnumber $[0:$["root":1], 51:$["suser":1]] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[0:$["root":1]], "gids":$[0:1], "groupnames":$["root":1], "root":$["cn":"root", "gidnumber":0, "type":"system"]] -Read .passwd.system.groups.by_gidnumber $[0:$["root":1]] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.local.users.last_uid 500 -Read .passwd.local.users.homes $["/home/hh":1] -Read .passwd.local.users.usernames $["hh":1] -Read .passwd.local.users.uids $[500:1] -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $["root":1, "suser":1] -Read .passwd.system.users.uids $[0:1, 51:1] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] -Read .passwd.system.groups.gids $[0:1] -Read .passwd.system.groups.groupnames $["root":1] Return Return nil Dump selected user with id 500: -Dump $["homedirectory":"/home/hh", "loginshell":"/bin/bash", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500"] +Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] Dump ========================================================== Return nil -Dump selected user with id 51: -Dump $["type":"system", "uid":"suser", "uidnumber":"51"] +Dump selected user with id 25: +Dump $["addit_data":"", "cn":"Batch jobs daemon", "gidnumber":"25", "grouplist":$[], "groupname":"", "homedirectory":"/var/spool/atjobs", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13636", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"system", "uid":"at", "uidnumber":"25", "userpassword":"!"] Dump ========================================================== Return nil Dump selected user with id 5001: Copied: trunk/users/testsuite/tests/SelectUser.ycp (from r40377, trunk/users/testsuite/tests/SelectUser.ycp.disabled) URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/SelectUser.ycp?p2=trunk/users/testsuite/tests/SelectUser.ycp&p1=trunk/users/testsuite/tests/SelectUser.ycp.disabled&r1=40377&r2=40391&rev=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/SelectUser.ycp.disabled (original) +++ trunk/users/testsuite/tests/SelectUser.ycp Wed Aug 22 10:48:56 2007 @@ -1,7 +1,6 @@ { // testedfiles: Users.pm - include "testsuite.ycp"; import "Users"; import "UsersCache"; import "Mode"; @@ -9,98 +8,16 @@ import "Progress"; import "Report"; + string tmpdir = Directory::tmpdir; + foreach (string file, [ "passwd", "group", "shadow" ], { + SCR::Execute (.target.bash, sformat ("/bin/cp ./%1 %2/", file, tmpdir)); + }); + Users::SetBaseDirectory (tmpdir); + Users::ReadLocal (); + + import "Testsuite"; + map READ = $[ - "passwd": $[ - "local": $[ - "users": $[ - "hh": $[ - "uid" : "hh", - "uidnumber" : 500, - "homedirectory" : "/home/hh", - "sn" : "HH", - "loginshell" : "/bin/bash", - "type" : "local" - ], - "by_uidnumber": $[ - 500 : $["hh":1], - ], - "last_uid": 500, - "homes": $[ - "/home/hh": 1, - ], - "usernames": $[ - "hh": 1, - ], - "uids": $[ - 500: 1, - ] - ], - "shadow": $[ - ], - "groups": $[ - "users": $[ - "cn" : "users", - "gidnumber": 100, - "type" : "local" - ], - "by_gidnumber": $[ - 100 : $["users":1], - ], - "gids": $[ - 100: 1, - ], - "groupnames": $[ - "users": 1, - ] - ], - ], - "system": $[ - "users": $[ - "root": $[ - "uid" : "root", - "uidnumber" : 0 - ], - "suser": $[ - "uid" : "suser", - "uidnumber" : 51, - "type" : "system" - ], - "by_uidnumber": $[ - 0 : $["root":1], - 51 : $["suser":1], - ], - "last_uid": 0, - "homes": $[ - ], - "usernames": $[ - "root" : 1, - "suser" : 1, - ], - "uids": $[ - 0 : 1, - 51 : 1 - ], - ], - "shadow": $[ - ], - "groups": $[ - "root": $[ - "cn": "root", - "gidnumber": 0, - "type" : "system" - ], - "by_gidnumber": $[ - 0 : $["root": 1], - ], - "gids": $[ - 0 : 1 - ], - "groupnames": $[ - "root" : 1 - ] - ], - ], - ], "etc" : $[ "fstab": [], "cryptotab": [], @@ -143,26 +60,26 @@ ], ]; - DUMP ("=========================================================="); + Testsuite::Dump ("=========================================================="); Mode::SetTest ("test"); - TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0); + Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0); - TEST(``(Users::SelectUser (500)), [], 0); + Testsuite::Test(``(Users::SelectUser (500)), [], 0); - DUMP (sformat ("selected user with id 500:\n %1", Users::GetCurrentUser())); + Testsuite::Dump (sformat ("selected user with id 500:\n %1", Users::GetCurrentUser())); - DUMP ("=========================================================="); + Testsuite::Dump ("=========================================================="); - TEST(``(Users::SelectUser (51)), [], 0); + Testsuite::Test(``(Users::SelectUser (25)), [], 0); - DUMP (sformat ("selected user with id 51:\n %1",Users::GetCurrentUser ()) ); + Testsuite::Dump (sformat ("selected user with id 25:\n %1",Users::GetCurrentUser ()) ); - DUMP ("=========================================================="); + Testsuite::Dump ("=========================================================="); - TEST(``(Users::SelectUser (5001)), [], 0); + Testsuite::Test(``(Users::SelectUser (5001)), [], 0); - DUMP (sformat("selected user with id 5001:\n %1",Users::GetCurrentUser ())); + Testsuite::Dump (sformat("selected user with id 5001:\n %1",Users::GetCurrentUser ())); } Modified: trunk/users/testsuite/tests/YaPIGroupAdd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/YaPIGroupAdd.out?rev=40391&r1=40390&r2=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/YaPIGroupAdd.out (original) +++ trunk/users/testsuite/tests/YaPIGroupAdd.out Wed Aug 22 10:48:56 2007 @@ -1,4 +1,6 @@ Dump ========================================================== +Return nil +Return nil Dump ============ add new group 'gg': ========================== Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 @@ -11,40 +13,14 @@ Read .etc.nsswitch_conf.passwd 0 Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[500:$["hh":1]], "hh":$["uid":"hh"], "homes":$["/home/hh":1], "last_uid":500, "uids":$[500:1], "usernames":$["hh":1]] -Read .passwd.local.users.by_uidnumber $[500:$["hh":1]] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[0:$["root":1]], "homes":$[], "last_uid":0, "root":$["uid":"root", "uidnumber":0], "uids":$[0:1], "usernames":$["root":1]] -Read .passwd.system.users.by_uidnumber $[0:$["root":1]] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[0:$["root":1]], "gids":$[0:1], "groupnames":$["root":1], "root":$["cn":"root", "gidnumber":0, "type":"system"]] -Read .passwd.system.groups.by_gidnumber $[0:$["root":1]] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.local.users.last_uid 500 -Read .passwd.local.users.homes $["/home/hh":1] -Read .passwd.local.users.usernames $["hh":1] -Read .passwd.local.users.uids $[500:1] -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $["root":1] -Read .passwd.system.users.uids $[0:1] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] -Read .passwd.system.groups.gids $[0:1] -Read .passwd.system.groups.groupnames $["root":1] Execute .target.bash_output "echo 'gg' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .passwd.groups $["local":$["by_gidnumber":$["100":$["users":"1"]], "gg":$["cn":"gg", "gidnumber":"1000", "modified":"added", "org_cn":"gg", "org_gidnumber":"1000", "plugins":[], "type":"local", "userlist":$[], "what":"add_group"], "gids":$["100":"1"], "groupnames":$["users":"1"], "users":$["cn":"users", "gidnumber":"100", "type":"local"]], "system":$["by_gidnumber":$["0":$["root":"1"]], "gids":$["0":"1"], "groupnames":$["root":"1"], "root":$["cn":"root", "gidnumber":"0", "type":"system"]]] true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\nusers:x:100:\n+:::\n" true Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return Dump ============ add new group 'gg' - done ==================== -Dump ============ add new group 'gg' with first userlist as list == +Dump ============ add new group 'gg2' with first userlist as list == Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -56,40 +32,14 @@ Read .etc.nsswitch_conf.passwd 0 Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[500:$["hh":1]], "hh":$["uid":"hh"], "homes":$["/home/hh":1], "last_uid":500, "uids":$[500:1], "usernames":$["hh":1]] -Read .passwd.local.users.by_uidnumber $[500:$["hh":1]] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[0:$["root":1]], "homes":$[], "last_uid":0, "root":$["uid":"root", "uidnumber":0], "uids":$[0:1], "usernames":$["root":1]] -Read .passwd.system.users.by_uidnumber $[0:$["root":1]] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[0:$["root":1]], "gids":$[0:1], "groupnames":$["root":1], "root":$["cn":"root", "gidnumber":0, "type":"system"]] -Read .passwd.system.groups.by_gidnumber $[0:$["root":1]] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.local.users.last_uid 500 -Read .passwd.local.users.homes $["/home/hh":1] -Read .passwd.local.users.usernames $["hh":1] -Read .passwd.local.users.uids $[500:1] -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $["root":1] -Read .passwd.system.users.uids $[0:1] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] -Read .passwd.system.groups.gids $[0:1] -Read .passwd.system.groups.groupnames $["root":1] -Execute .target.bash_output "echo 'gg' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg"] +Execute .target.bash_output "echo 'gg2' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg2"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .passwd.groups $["local":$["by_gidnumber":$["100":$["users":"1"]], "gg":$["cn":"gg", "gidnumber":"1000", "modified":"added", "org_cn":"gg", "org_gidnumber":"1000", "plugins":[], "type":"local", "userlist":$["hh1":"1", "hh2":"1"], "what":"add_group"], "gids":$["100":"1"], "groupnames":$["users":"1"], "users":$["cn":"users", "gidnumber":"100", "type":"local"]], "system":$["by_gidnumber":$["0":$["root":"1"]], "gids":$["0":"1"], "groupnames":$["root":"1"], "root":$["cn":"root", "gidnumber":"0", "type":"system"]]] true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\nusers:x:100:\n+:::\n" true Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return -Dump ============ add new group 'gg' - done ==================== -Dump ============ add new group 'gg' with first userlist as map == +Dump ============ add new group 'gg2' - done ==================== +Dump ============ add new group 'gg3' with first userlist as map == Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -101,39 +51,13 @@ Read .etc.nsswitch_conf.passwd 0 Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[500:$["hh":1]], "hh":$["uid":"hh"], "homes":$["/home/hh":1], "last_uid":500, "uids":$[500:1], "usernames":$["hh":1]] -Read .passwd.local.users.by_uidnumber $[500:$["hh":1]] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[0:$["root":1]], "homes":$[], "last_uid":0, "root":$["uid":"root", "uidnumber":0], "uids":$[0:1], "usernames":$["root":1]] -Read .passwd.system.users.by_uidnumber $[0:$["root":1]] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[0:$["root":1]], "gids":$[0:1], "groupnames":$["root":1], "root":$["cn":"root", "gidnumber":0, "type":"system"]] -Read .passwd.system.groups.by_gidnumber $[0:$["root":1]] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.local.users.last_uid 500 -Read .passwd.local.users.homes $["/home/hh":1] -Read .passwd.local.users.usernames $["hh":1] -Read .passwd.local.users.uids $[500:1] -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $["root":1] -Read .passwd.system.users.uids $[0:1] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] -Read .passwd.system.groups.gids $[0:1] -Read .passwd.system.groups.groupnames $["root":1] -Execute .target.bash_output "echo 'gg' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg"] +Execute .target.bash_output "echo 'gg3' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg3"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .passwd.groups $["local":$["by_gidnumber":$["100":$["users":"1"]], "gg":$["cn":"gg", "gidnumber":"1000", "modified":"added", "org_cn":"gg", "org_gidnumber":"1000", "plugins":[], "type":"local", "userlist":$["hh1":"1", "hh2":"1"], "what":"add_group"], "gids":$["100":"1"], "groupnames":$["users":"1"], "users":$["cn":"users", "gidnumber":"100", "type":"local"]], "system":$["by_gidnumber":$["0":$["root":"1"]], "gids":$["0":"1"], "groupnames":$["root":"1"], "root":$["cn":"root", "gidnumber":"0", "type":"system"]]] true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\ngg3:x:1002:hh1,hh2\nusers:x:100:\n+:::\n" true Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return -Dump ============ add new group 'gg' - done ==================== +Dump ============ add new group 'gg3' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 @@ -146,32 +70,6 @@ Read .etc.nsswitch_conf.passwd 0 Read .etc.nsswitch_conf.passwd 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true -Execute .passwd.init $["base_directory":"/etc", "max_system_gid":"499", "max_system_uid":"499"] true -Read .passwd.local.users $["by_uidnumber":$[500:$["hh":1]], "hh":$["uid":"hh"], "homes":$["/home/hh":1], "last_uid":500, "uids":$[500:1], "usernames":$["hh":1]] -Read .passwd.local.users.by_uidnumber $[500:$["hh":1]] -Read .passwd.local.shadow $[] -Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local"]] -Read .passwd.local.groups.by_gidnumber $[100:$["users":1]] -Read .passwd.system.users $["by_uidnumber":$[0:$["root":1]], "homes":$[], "last_uid":0, "root":$["uid":"root", "uidnumber":0], "uids":$[0:1], "usernames":$["root":1]] -Read .passwd.system.users.by_uidnumber $[0:$["root":1]] -Read .passwd.system.shadow $[] -Read .passwd.system.groups $["by_gidnumber":$[0:$["root":1]], "gids":$[0:1], "groupnames":$["root":1], "root":$["cn":"root", "gidnumber":0, "type":"system"]] -Read .passwd.system.groups.by_gidnumber $[0:$["root":1]] -Read .passwd.passwd.pluslines 0 -Read .passwd.shadow.pluslines 0 -Read .passwd.group.pluslines 0 -Read .passwd.local.users.last_uid 500 -Read .passwd.local.users.homes $["/home/hh":1] -Read .passwd.local.users.usernames $["hh":1] -Read .passwd.local.users.uids $[500:1] -Read .passwd.system.users.last_uid 0 -Read .passwd.system.users.homes $[] -Read .passwd.system.users.usernames $["root":1] -Read .passwd.system.users.uids $[0:1] -Read .passwd.local.groups.gids $[100:1] -Read .passwd.local.groups.groupnames $["users":1] -Read .passwd.system.groups.gids $[0:1] -Read .passwd.system.groups.groupnames $["root":1] Execute .target.bash_output "echo 'root' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"root"] Return There is a conflict between the entered Dump ------------ GroupAdd return value: Copied: trunk/users/testsuite/tests/YaPIGroupAdd.ycp (from r40377, trunk/users/testsuite/tests/YaPIGroupAdd.ycp.disabled) URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/YaPIGroupAdd.ycp?p2=trunk/users/testsuite/tests/YaPIGroupAdd.ycp&p1=trunk/users/testsuite/tests/YaPIGroupAdd.ycp.disabled&r1=40377&r2=40391&rev=40391&view=diff ============================================================================== --- trunk/users/testsuite/tests/YaPIGroupAdd.ycp.disabled (original) +++ trunk/users/testsuite/tests/YaPIGroupAdd.ycp Wed Aug 22 10:48:56 2007 @@ -1,94 +1,32 @@ /** + * File : YaPIGroupAdd.ycp + * Module : Users configurator + * Summary : Test of USERS::GroupAdd function + * Author : Jiri Suchomel + * * $Id$ */ { // testedfiles: Users.pm UsersCache.pm USERS.pm - include "testsuite.ycp"; - import "YaPI::USERS"; + import "Directory"; import "Mode"; + import "Users"; + import "UsersPasswd"; + import "YaPI::USERS"; + + string tmpdir = Directory::tmpdir; + foreach (string file, [ "passwd", "group", "shadow" ], { + SCR::Execute (.target.bash, sformat ("/bin/cp ./%1 %2/", file, tmpdir)); + }); + Users::SetBaseDirectory (tmpdir); + Users::ReadLocal (); + + import "Testsuite"; map R = $[ - "passwd": $[ - "local": $[ - "users": $[ - "hh": $[ - "uid": "hh" - ], - "by_uidnumber": $[ - 500 : $["hh":1], - ], - "last_uid": 500, - "homes": $[ - "/home/hh": 1, - ], - "usernames": $[ - "hh": 1, - ], - "uids": $[ - 500: 1, - ] - ], - "shadow": $[ - ], - "groups": $[ - "users": $[ - "cn" : "users", - "gidnumber": 100, - "type" : "local" - ], - "by_gidnumber": $[ - 100 : $[ "users":1], - ], - "gids": $[ - 100: 1, - ], - "groupnames": $[ - "users": 1, - ] - ], - ], - "system": $[ - "users": $[ - "root": $[ - "uid" : "root", - "uidnumber" : 0 - ], - "by_uidnumber": $[ - 0 : $["root":1], - ], - "last_uid": 0, - "homes": $[ - ], - "usernames": $[ - "root" : 1, - ], - "uids": $[ - 0 : 1 - ], - ], - "shadow": $[ - ], - "groups": $[ - "root": $[ - "cn": "root", - "gidnumber": 0, - "type" : "system" - ], - "by_gidnumber": $[ - 0 : $["root" : 1] - ], - "gids": $[ - 0 : 1 - ], - "groupnames": $[ - "root" : 1 - ] - ], - ], - ], "etc" : $[ "fstab": [], "cryptotab": [], @@ -128,38 +66,44 @@ ] ]; - DUMP ("=========================================================="); + Testsuite::Dump ("=========================================================="); Mode::SetTest ("test"); + Testsuite::Test (``(Users::SetBaseDirectory ("/etc")), [], 0); + Testsuite::Test (``(UsersPasswd::SetBaseDirectory ("/etc")), [], 0); + map config_map = $[]; map data_map = $[ "cn" : "gg", ]; E ["target", "bash_output", "stdout"] = "gg"; - DUMP ("============ add new group 'gg': =========================="); - TEST (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); - DUMP ("============ add new group 'gg' - done ===================="); + Testsuite::Dump ("============ add new group 'gg': =========================="); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump ("============ add new group 'gg' - done ===================="); data_map ["userlist"] = [ "hh1", "hh2" ]; + data_map ["cn"] = "gg2"; + E ["target", "bash_output", "stdout"] = "gg2"; - DUMP ("============ add new group 'gg' with first userlist as list =="); - TEST (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); - DUMP ("============ add new group 'gg' - done ===================="); + Testsuite::Dump ("============ add new group 'gg2' with first userlist as list =="); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump ("============ add new group 'gg2' - done ===================="); data_map ["userlist"] = $[ "hh1" : 1, "hh2" : 1 ]; + data_map ["cn"] = "gg3"; + E ["target", "bash_output", "stdout"] = "gg3"; - DUMP ("============ add new group 'gg' with first userlist as map =="); - TEST (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); - DUMP ("============ add new group 'gg' - done ===================="); - + Testsuite::Dump ("============ add new group 'gg3' with first userlist as map =="); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump ("============ add new group 'gg3' - done ===================="); - DUMP ("============ add new group 'root' (groupname conflict): ======"); + Testsuite::Dump ("============ add new group 'root' (groupname conflict): ======"); data_map = $[ "cn" : "root" @@ -167,9 +111,9 @@ E ["target", "bash_output", "stdout"] = "root"; string error = (string) - TEST (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); - DUMP (sformat ("------------ GroupAdd return value:\n%1", error)); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump (sformat ("------------ GroupAdd return value:\n%1", error)); - DUMP ("============ add new group 'root' - done ===================="); - DUMP ("=========================================================="); + Testsuite::Dump ("============ add new group 'root' - done ===================="); + Testsuite::Dump ("=========================================================="); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org