Mailinglist Archive: yast-commit (815 mails)
| < Previous | Next > |
[yast-commit] r40382 - in /trunk/users/testsuite: ./ tests/
- From: jsuchome@xxxxxxxxxxxxxxxx
- Date: Tue, 21 Aug 2007 15:04:59 -0000
- Message-id: <20070821150500.4DF3326C95@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Tue Aug 21 17:04:59 2007
New Revision: 40382
URL: http://svn.opensuse.org/viewcvs/yast?rev=40382&view=rev
Log:
enable testsuite again
Added:
trunk/users/testsuite/group
trunk/users/testsuite/passwd
trunk/users/testsuite/shadow
trunk/users/testsuite/tests/AddGroup.ycp (with props)
trunk/users/testsuite/tests/AddUser.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/AddUser.ycp.disabled
trunk/users/testsuite/tests/BuildAdditional.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/BuildAdditional.ycp.disabled
trunk/users/testsuite/tests/DeleteUser.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/DeleteUser.ycp.disabled
trunk/users/testsuite/tests/EditUser.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/EditUser.ycp.disabled
trunk/users/testsuite/tests/EditUsersGroups.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled
Removed:
trunk/users/testsuite/tests/AddGroup.ycp.disabled
trunk/users/testsuite/tests/AddUser.ycp.disabled
trunk/users/testsuite/tests/BuildAdditional.ycp.disabled
trunk/users/testsuite/tests/DeleteUser.ycp.disabled
trunk/users/testsuite/tests/EditUser.ycp.disabled
trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled
Modified:
trunk/users/testsuite/Makefile.am
trunk/users/testsuite/tests/AddGroup.out
trunk/users/testsuite/tests/AddUser.out
trunk/users/testsuite/tests/BuildAdditional.out
trunk/users/testsuite/tests/DeleteUser.out
trunk/users/testsuite/tests/EditUser.out
trunk/users/testsuite/tests/EditUsersGroups.out
Modified: trunk/users/testsuite/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/Makefile.am?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/Makefile.am (original)
+++ trunk/users/testsuite/Makefile.am Tue Aug 21 17:04:59 2007
@@ -5,7 +5,7 @@
#
AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
+EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) passwd shadow group
testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
Added: trunk/users/testsuite/group
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/group?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/group (added)
+++ trunk/users/testsuite/group Tue Aug 21 17:04:59 2007
@@ -0,0 +1,5 @@
+audio:x:17:ii
+nobody:x:65533:
+root:x:0:
+users:x:100:
++:::
Added: trunk/users/testsuite/passwd
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/passwd?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/passwd (added)
+++ trunk/users/testsuite/passwd Tue Aug 21 17:04:59 2007
@@ -0,0 +1,10 @@
+at:x:25:25:Batch jobs daemon:/var/spool/atjobs:/bin/bash
+bin:x:1:1:bin:/bin:/bin/bash
+daemon:x:2:2:Daemon:/sbin:/bin/bash
+mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
+nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
+root:x:0:0:root:/root:/bin/bash
+hh:x:500:100:HaHa:/home/hh:/bin/bash
+ii:x:555:100:Test user:/home/ii:/bin/bash
+uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
++::::::
Added: trunk/users/testsuite/shadow
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/shadow?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/shadow (added)
+++ trunk/users/testsuite/shadow Tue Aug 21 17:04:59 2007
@@ -0,0 +1,9 @@
+at:!:13636:0:99999:7:::
+bin:*:13636::::::
+daemon:*:13636::::::
+mail:*:13636::::::
+nobody:*:13636::::::
+root:password:13636::::::
+hh:heslo:13727:0:99999:7:::
+uucp:*:13636::::::
++::0:0:0::::
Modified: trunk/users/testsuite/tests/AddGroup.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddGroup.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/AddGroup.out (original)
+++ trunk/users/testsuite/tests/AddGroup.out Tue Aug 21 17:04:59 2007
@@ -7,41 +7,12 @@
Read .etc.default.useradd."shell" 0
Read .etc.default.useradd."skel" 0
Read .target.string "/etc/shells" 0
-Read .target.stat "0" $[]
Read .etc.nsswitch_conf.passwd 0
-Read .target.stat "/usr/lib/yp/yphelper" $[]
Read .etc.nsswitch_conf.passwd 0
-Read .target.stat "/var/lib/YaST2/users.ycp" $[]
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":$["gecos":"HaHa", "gidnumber":100, "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":$[], "homes":$[], "last_uid":0, "uids":$[], "usernames":$[]]
-Read .passwd.system.users.by_uidnumber $[]
-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 ["+"]
-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 $[]
-Read .passwd.system.users.uids $[]
-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
Dump local user names:
-Dump ["hh"]
+Dump ["hh", "ii"]
Dump local group names:
Dump ["users"]
Dump ---- current group:
@@ -57,10 +28,10 @@
Dump ---- check group after add:
Dump
Dump ---- user 'hh':
-Dump $["gecos":"HaHa", "gidnumber":"100", "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"]
Return true
Dump ---- user 'hh':
-Dump $["gecos":"HaHa", "gidnumber":"100", "grouplist":$["testgrp":"1"], "org_uid":"hh", "org_uidnumber":"500", "type":"local", "uid":"hh", "uidnumber":"500", "what":"group_change"]
+Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$["testgrp":"1"], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"500", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo", "what":"group_change"]
Dump ==========================================================
Dump local group names:
Dump ["testgrp", "users"]
Added: trunk/users/testsuite/tests/AddGroup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddGroup.ycp?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/tests/AddGroup.ycp (added)
+++ trunk/users/testsuite/tests/AddGroup.ycp Tue Aug 21 17:04:59 2007
@@ -0,0 +1,171 @@
+/**
+ * File:
+ * AddGroup.ycp
+ *
+ * Module:
+ * Users configurator
+ *
+ * Summary:
+ * Saving group tests.
+ *
+ * Authors:
+ * Jiri Suchomel <jsuchome@xxxxxxx>
+ *
+ */
+
+{
+ // testedfiles: Users.pm
+
+ import "Directory";
+ import "Users";
+ import "UsersCache";
+ import "Mode";
+ import "Directory";
+ import "Progress";
+ import "Report";
+
+ // we need to read the real data from the system, not given in map for
+ // dummy agent
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+ // passwd etc. read, now we can switch to the test mode
+
+ map READ = $[
+ "product": $[
+ "features": $[
+ "USE_DESKTOP_SCHEDULER" : "no",
+ "ENABLE_AUTOLOGIN" : "false",
+ "IO_SCHEDULER" : "",
+ "EVMS_CONFIG" : "no",
+ "UI_MODE" : "simple",
+ "INCOMPLETE_TRANSLATION_TRESHOLD" : "99",
+ ]
+ ],
+ "etc" : $[
+ "fstab": [],
+ "cryptotab": [],
+ "default": $[
+ "useradd": $[
+ "home": "/home",
+ "groups": "audio,video",
+ "group": 100
+ ]
+ ],
+ ],
+ "target": $[
+ "size" : -1,
+ "stat" : $[],
+ ],
+ /* To simulate NIS server, use target.size = 0 and this:
+ "sysconfig": $[
+ "ypserv" : $[
+ "YPPWD_SRCDIR" : "/etc"
+ ]
+ ],
+ */
+ ];
+
+ map WRITE = $[];
+ map EXEC = $[
+ "passwd" : $[
+ "init" : true
+ ],
+ "target" : $[
+ "bash" : 0,
+ "bash_output":$[
+ "stdout": "",
+ ],
+ ],
+ ];
+
+ Mode::SetTest ("test");
+
+ import "Testsuite";
+
+ Testsuite::Dump ("==========================================================");
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
+ Testsuite::Dump ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+ Testsuite::Dump (sformat ("---- current group:\n %1", Users::GetCurrentGroup ()));
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- current group (empty add, to get default values):\n %1", Users::GetCurrentGroup ()));
+
+ map <string,any> group = $[
+ "gidnumber" : 555,
+ "cn" : "testgrp",
+ "userlist" : $[ "hh" : 1 ],
+ "password" :"x",
+ "type" : "local",
+ "what" : "add_group"
+ ];
+
+ Testsuite::Test (``(Users::AddGroup (group)), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- current group (after rich add):\n %1", Users::GetCurrentGroup ()));
+
+ EXEC ["target", "bash_output", "stdout"] = "testgrp";
+
+ string error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+
+ Users::SelectUserByName ("hh");
+
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+
+ Testsuite::Test(``(Users::CommitGroup ()), [READ, WRITE, EXEC], 0);
+
+ Users::SelectUserByName ("hh");
+
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+
+ Testsuite::Dump ("==========================================================");
+
+ Testsuite::Dump ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+
+ Testsuite::Dump ("================= gid conflict (not fatal any more) ======");
+
+ EXEC ["target", "bash_output", "stdout"] = "new";
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::AddGroup ($[ "cn" : "new", "gidnumber": 0, "type": "system"])),
+ [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- current group after add:\n %1", Users::GetCurrentGroup ()));
+
+ error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+
+ Testsuite::Dump ("================= name conflict ==========================");
+
+ EXEC ["target", "bash_output", "stdout"] = "testgrp";
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::AddGroup ($[ "cn" : "testgrp"])), [], 0);
+
+ Testsuite::Dump (sformat ("---- current group after add):\n %1", Users::GetCurrentGroup ()));
+
+ error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+
+ Testsuite::Dump ("================= name too short =========================");
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::AddGroup ($[ "cn" : "t"])), [], 0);
+
+ Testsuite::Dump (sformat ("---- current group after add:\n %1", Users::GetCurrentGroup ()));
+
+ error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+}
Modified: trunk/users/testsuite/tests/AddUser.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddUser.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/AddUser.out (original)
+++ trunk/users/testsuite/tests/AddUser.out Tue Aug 21 17:04:59 2007
@@ -10,32 +10,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", "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]], "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"]
Return
Dump ---- current user:
Dump $[]
@@ -48,13 +22,13 @@
Execute .target.bash_output "echo 'aaa' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"aaa"]
Return
Dump ---- current group (before user commit):
-Dump $["cn":"users", "gidnumber":"100", "type":"local"]
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userlist":$[], "userpassword":"x"]
Dump ---- check user after add:
Dump
Dump ---- commit user:
Return true
Dump ---- current group (afer user commit):
-Dump $["cn":"users", "gidnumber":"100", "more_users":$["aaa":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "what":"user_change_default"]
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["aaa":"1", "hh":"1", "ii":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "userlist":$[], "userpassword":"x", "what":"user_change_default"]
Dump =================== no password ==========================
Return
Return
@@ -74,7 +48,7 @@
Return There is a conflict between the entered
Dump ---- check user after add:
Dump There is a conflict between the entered
-Dump username and an existing username.
+Dump username and an existing username.
Dump Try another one.
Dump ==================== uidnumber problems ===================
Return
Copied: trunk/users/testsuite/tests/AddUser.ycp (from r40377, trunk/users/testsuite/tests/AddUser.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddUser.ycp?p2=trunk/users/testsuite/tests/AddUser.ycp&p1=trunk/users/testsuite/tests/AddUser.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/AddUser.ycp.disabled (original)
+++ trunk/users/testsuite/tests/AddUser.ycp Tue Aug 21 17:04:59 2007
@@ -16,7 +16,7 @@
{
// testedfiles: Users.pm UsersLDAP.pm UsersCache.pm
- import "Testsuite";
+ import "Directory";
import "Users";
import "UsersCache";
import "UsersLDAP";
@@ -24,86 +24,15 @@
import "Progress";
import "Report";
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "uidnumber" : 500
- ],
- "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": [],
@@ -142,14 +71,14 @@
],
];
- Testsuite::Dump ("==========================================================");
+ import "Testsuite";
+ Testsuite::Dump ("==========================================================");
Mode::SetTest ("test");
Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
Testsuite::Dump (sformat ("---- current user:\n %1", Users::GetCurrentUser ()));
-
Testsuite::Test (``(Users::AddUser ($[])), [READ, WRITE, EXEC], 0);
Testsuite::Dump (sformat ("---- current user (empty add):\n %1", Users::GetCurrentUser ()));
Modified: trunk/users/testsuite/tests/BuildAdditional.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/BuildAdditional.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/BuildAdditional.out (original)
+++ trunk/users/testsuite/tests/BuildAdditional.out Tue Aug 21 17:04:59 2007
@@ -10,35 +10,9 @@
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], 600:$["ii":1]], "hh":$["gecos":"HaHa", "gidnumber":100, "uid":"hh", "uidnumber":500], "homes":$["/home/hh":1], "ii":$["gecos":"Ia", "gidnumber":100, "uid":"ii", "uidnumber":600], "last_uid":600, "uids":$[500:1, 600:1], "usernames":$["hh":1, "ii":1]]
-Read .passwd.local.users.by_uidnumber $[500:$["hh":1], 600:$["ii":1]]
-Read .passwd.local.shadow $[]
-Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "by_name":$[], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidNumber":100, "type":"local", "userlist":$["ii":1]]]
-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":$[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 600
-Read .passwd.local.users.homes $["/home/hh":1]
-Read .passwd.local.users.usernames $["hh":1, "ii":1]
-Read .passwd.local.users.uids $[500:1, 600:1]
-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 $[0:1]
-Read .passwd.system.groups.groupnames $["root":1]
Return
Dump ---- current group:
-Dump $["cn":"users", "gidNumber":"100", "type":"local", "userlist":$["ii":"1"]]
+Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"]
Dump ---- create additional users list:
Dump
-Return [`item (`id ("hh"), "hh", false), `item (`id ("ii"), "ii", true)]
+Return [`item (`id ("at"), "at", false), `item (`id ("bin"), "bin", false), `item (`id ("daemon"), "daemon", false), `item (`id ("hh"), "hh", false), `item (`id ("ii"), "ii", true), `item (`id ("mail"), "mail", false), `item (`id ("nobody"), "nobody", false), `item (`id ("root"), "root", false), `item (`id ("uucp"), "uucp", false)]
Copied: trunk/users/testsuite/tests/BuildAdditional.ycp (from r40377, trunk/users/testsuite/tests/BuildAdditional.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/BuildAdditional.ycp?p2=trunk/users/testsuite/tests/BuildAdditional.ycp&p1=trunk/users/testsuite/tests/BuildAdditional.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/BuildAdditional.ycp.disabled (original)
+++ trunk/users/testsuite/tests/BuildAdditional.ycp Tue Aug 21 17:04:59 2007
@@ -1,7 +1,6 @@
{
// testedfiles: Users.pm UserCache.pm
- include "testsuite.ycp";
import "Users";
import "UsersCache";
import "Mode";
@@ -9,90 +8,18 @@
import "Progress";
import "Report";
+ // we need to read the real data from the system, not given in map for
+ // dummy agent
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+ // passwd etc. read, now we can switch to the test mode
+
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "gecos" : "HaHa",
- "gidnumber" : 100,
- "uidnumber" : 500
- ],
- "ii": $[
- "uid" : "ii",
- "gecos" : "Ia",
- "gidnumber" : 100,
- "uidnumber" : 600
- ],
- "by_uidnumber": $[
- 500 : $[ "hh" : 1 ],
- 600 : $[ "ii" : 1 ],
- ],
- "last_uid": 600,
- "homes": $[
- "/home/hh": 1,
- ],
- "usernames": $[
- "hh": 1,
- "ii": 1,
- ],
- "uids": $[
- 500: 1,
- 600: 1
- ]
- ],
- "shadow": $[
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidNumber": 100,
- "type" : "local",
- "userlist" : $[ "ii" : 1 ],
- ],
- "by_gidnumber": $[
- 100 : $[ "users" : 1 ],
- ],
- "by_name": $[
- ],
- "gids": $[
- 100: 1,
- ],
- "groupnames": $[
- "users": 1,
- ]
- ],
- ],
- "system": $[
- "users": $[
- "by_uidnumber": $[
- ],
- "last_uid": 0,
- "homes": $[],
- "usernames": $[],
- "uids": $[],
- ],
- "shadow": $[
- ],
- "groups": $[
- "root": $[
- "cn": "root",
- "gidNumber": 0,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 0 : $[ "root" : 1]
- ],
- "gids": $[
- 0 : 1
- ],
- "groupnames": $[
- "root" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -130,20 +57,21 @@
],
];
- DUMP ("==========================================================");
+ import "Testsuite";
+ Testsuite::Dump ("==========================================================");
Mode::SetTest ("test");
- TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
- Users::SelectGroupByName ("users");
+ Users::SelectGroupByName ("audio");
map <string,any> group = Users::GetCurrentGroup ();
- DUMP (sformat ("---- current group:\n %1", group));
-
- DUMP ("---- create additional users list:\n");
+ Testsuite::Dump (sformat ("---- current group:\n %1", group));
- list additional = (list)
- TEST(``(UsersCache::BuildAdditional (group)), [ READ, WRITE], 0);
+ // only 'ii' is checked ('true' in the item)
+ Testsuite::Dump ("---- create additional users list:\n");
+ list additional = (list) Testsuite::Test (
+ ``(UsersCache::BuildAdditional (group)), [ READ, WRITE], 0);
}
Modified: trunk/users/testsuite/tests/DeleteUser.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/DeleteUser.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/DeleteUser.out (original)
+++ trunk/users/testsuite/tests/DeleteUser.out Tue Aug 21 17:04:59 2007
@@ -9,49 +9,27 @@
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":$["gecos":"HaHa", "gidnumber":100, "grouplist":$["grp":1], "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 $["hh":$[]]
-Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1], 500:$["grp":1]], "gids":$[100:1, 500:1], "groupnames":$["grp":1, "users":1], "grp":$["cn":"grp", "gidNumber":500, "type":"local", "userlist":$["hh":1]], "users":$["cn":"users", "gidNumber":100, "type":"local"]]
-Read .passwd.local.groups.by_gidnumber $[100:$["users":1], 500:$["grp":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":$[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 $[]
-Read .passwd.system.users.uids $[]
-Read .passwd.local.groups.gids $[100:1, 500:1]
-Read .passwd.local.groups.groupnames $["grp":1, "users":1]
-Read .passwd.system.groups.gids $[0:1]
-Read .passwd.system.groups.groupnames $["root":1]
Return
Dump local users:
-Dump $["hh":$["gecos":"HaHa", "gidnumber":"100", "grouplist":$["grp":"1"], "type":"local", "uid":"hh", "uidnumber":"500"]]
+Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":nil], "ii":$["addit_data":"", "cn":"Test user", "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/home/ii", "loginshell":"/bin/bash", "type":"local", "uid":"ii", "uidnumber":"555", "userpassword":nil]]
Dump local user names:
-Dump ["hh"]
+Dump ["hh", "ii"]
Dump local group names:
-Dump ["grp", "users"]
-Dump ---- user 'hh':
-Dump $["gecos":"HaHa", "gidnumber":"100", "grouplist":$["grp":"1"], "type":"local", "uid":"hh", "uidnumber":"500"]
-Dump ---- group 'grp':
-Dump $["cn":"grp", "gidNumber":"500", "type":"local", "userlist":$["hh":"1"]]
+Dump ["users"]
+Dump ---- user 'ii':
+Dump $["addit_data":"", "cn":"Test user", "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/home/ii", "loginshell":"/bin/bash", "type":"local", "uid":"ii", "uidnumber":"555", "userpassword":nil]
+Dump ---- group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"]
+Dump ---- group 'users':
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userlist":$[], "userpassword":"x"]
Dump ==================== running delete ======================
Return true
Return true
Dump local user names:
-Dump []
+Dump ["hh"]
Dump local users:
-Dump $[]
-Dump ---- group 'grp':
-Dump $["cn":"grp", "gidNumber":"500", "type":"local", "userlist":$[]]
+Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":nil]]
+Dump ---- group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidnumber":"17", "type":"system", "userlist":$[], "userpassword":"x", "what":"user_change"]
+Dump ---- group 'users':
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "userlist":$[], "userpassword":"x", "what":"user_change_default"]
Copied: trunk/users/testsuite/tests/DeleteUser.ycp (from r40377, trunk/users/testsuite/tests/DeleteUser.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/DeleteUser.ycp?p2=trunk/users/testsuite/tests/DeleteUser.ycp&p1=trunk/users/testsuite/tests/DeleteUser.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/DeleteUser.ycp.disabled (original)
+++ trunk/users/testsuite/tests/DeleteUser.ycp Tue Aug 21 17:04:59 2007
@@ -16,7 +16,6 @@
{
// testedfiles: Users.pm UsersCache.pm
- include "testsuite.ycp";
import "Users";
import "UsersCache";
import "Mode";
@@ -24,91 +23,15 @@
import "Progress";
import "Report";
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "gecos" : "HaHa",
- "gidnumber" : 100,
- "uidnumber" : 500,
- "grouplist" : $[ "grp" : 1],
- "type" : "local"
- ],
- "by_uidnumber": $[
- 500 : $[ "hh" : 1 ],
- ],
- "last_uid": 500,
- "homes": $[
- "/home/hh": 1,
- ],
- "usernames": $[
- "hh": 1,
- ],
- "uids": $[
- 500: 1,
- ]
- ],
- "shadow": $[
- "hh": $[
- ]
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidNumber": 100,
- "type" : "local"
- ],
- "grp": $[
- "cn" : "grp",
- "gidNumber": 500,
- "type" : "local",
- "userlist" : $[ "hh" : 1 ],
- ],
- "by_gidnumber": $[
- 100 : $["users":1],
- 500 : $[ "grp" :1],
- ],
- "gids": $[
- 100: 1,
- 500: 1,
- ],
- "groupnames": $[
- "users" : 1,
- "grp" : 1,
- ]
- ],
- ],
- "system": $[
- "users": $[
- "by_uidnumber": $[
- ],
- "last_uid": 0,
- "homes": $[],
- "usernames": $[],
- "uids": $[],
- ],
- "shadow": $[
- ],
- "groups": $[
- "root": $[
- "cn": "root",
- "gidNumber": 0,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 0 : $[ "root" : 1 ],
- ],
- "gids": $[
- 0 : 1
- ],
- "groupnames": $[
- "root" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -146,34 +69,41 @@
],
];
+ import "Testsuite";
+
Mode::SetTest ("test");
- TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
- DUMP ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
+ Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
+ Testsuite::Dump ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+ Users::SelectUserByName ("ii");
- DUMP ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
- DUMP ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+ Testsuite::Dump (sformat ("---- user 'ii':\n %1", Users::GetCurrentUser ()));
- Users::SelectUserByName ("hh");
+ Users::SelectGroupByName ("audio");
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- group 'audio':\n %1", Users::GetCurrentGroup ()));
- Users::SelectGroupByName ("grp");
+ Users::SelectGroupByName ("users");
- DUMP (sformat ("---- group 'grp':\n %1", Users::GetCurrentGroup ()));
+ Testsuite::Dump (sformat ("---- group 'users':\n %1", Users::GetCurrentGroup ()));
+ Testsuite::Dump ("==================== running delete ======================");
- DUMP ("==================== running delete ======================");
+ Testsuite::Test(``(Users::DeleteUser (true)), [], 0);
+ Testsuite::Test(``(Users::CommitUser ()), [], 0);
- TEST(``(Users::DeleteUser (true)), [], 0);
- TEST(``(Users::CommitUser ()), [], 0);
+ Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
+ Testsuite::Dump ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
- DUMP ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
- DUMP ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
+ Users::SelectGroupByName ("audio");
- Users::SelectGroupByName ("grp");
+ Testsuite::Dump (sformat ("---- group 'audio':\n %1", Users::GetCurrentGroup ()));
- DUMP (sformat ("---- group 'grp':\n %1", Users::GetCurrentGroup ()));
+ Users::SelectGroupByName ("users");
+ Testsuite::Dump (sformat ("---- group 'users':\n %1", Users::GetCurrentGroup ()));
}
Modified: trunk/users/testsuite/tests/EditUser.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUser.out (original)
+++ trunk/users/testsuite/tests/EditUser.out Tue Aug 21 17:04:59 2007
@@ -10,62 +10,40 @@
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":$["grouplist":$["users":1], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":500, "userpassword":nil], "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 $["hh":$["userpassword":"secret"]]
-Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local", "userlist":$["hh":1]]]
-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", "uidnumber":0]]
-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]
Return
Dump ---- user 'hh':
-Dump $["grouplist":$["users":"1"], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"secret"]
+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 ' '" $[]
Return
Dump ---- user 'hh':
-Dump $["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_uidnumber":"500", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"secret"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"]
+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_uidnumber":"500", "org_user":$["addit_data":"", "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "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"], "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 "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"]
Return
Dump ---- check user after edit:
Dump
Dump ---- commit user:
Return true
+Return nil
+Return nil
Execute .target.bash "/bin/cp /etc/passwd /etc/passwd.YaST2save" 0
-Write .passwd.users $["local":$["by_uidnumber":$["500":$["hh":"1"]], "hh":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "modified":"edited", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"secret"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "homes":$["/home/hh":"1"], "last_uid":"500", "uids":$["500":"1"], "usernames":$["hh":"1"]], "system":$["by_uidnumber":$["0":$["root":"1"]], "homes":$[], "last_uid":"0", "root":$["uid":"root", "uidnumber":"0"], "uids":$["0":"1"], "usernames":$["root":"1"]]] true
+Write .target.string "/etc/passwd" "at:x:25:25:Batch jobs daemon:/var/spool/atjobs:/bin/bash\nbin:x:1:1:bin:/bin:/bin/bash\ndaemon:x:2:2:Daemon:/sbin:/bin/bash\nmail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false\nnobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash\nroot:x:0:0:root:/root:/bin/bash\nuucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash\nhh:x:501:100:HaHa:/home/hh:/bin/bash\nii:x:555:100:Test user:/home/ii:/bin/bash\n+::::::\n" true
Read .target.stat "/home" $["isdir":true]
Read .target.stat "/home/hh" $["isdir":true]
Read .target.stat "/home/hh" $["isdir":true]
-Execute .target.bash_output "/bin/chown -R 501: /home/hh" $["stdout":"hh"]
+Execute .target.bash_output "/bin/chown -R 501:100 /home/hh" $["stdout":"hh"]
Execute .target.bash "/bin/cp /etc/shadow /etc/shadow.YaST2save" 0
-Write .passwd.shadow $["local":$["hh":$["userpassword":"secret"]], "system":$[]] true
+Write .target.string "/etc/shadow" "at:!:13636:0:99999:7:::\nbin:*:13636::::::\ndaemon:*:13636::::::\nmail:*:13636::::::\nnobody:*:13636::::::\nroot:password:13636::::::\nuucp:*:13636::::::\nhh:heslo:13727:0:99999:7:::\n+::0:0:0::::\n" true
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
Dump ---- user 500:
Dump $[]
Dump ---- user 501:
-Dump $["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"]
+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"]
Return
Dump ---- user 'hh':
-Dump $["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/new/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"]
+Dump $["addit_data":"", "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/new/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["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"], "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 "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"]
Return
Dump ---- check user after edit:
@@ -73,14 +51,14 @@
Dump ---- commit user:
Return true
Execute .target.bash "/bin/cp /etc/passwd /etc/passwd.YaST2save" 0
-Write .passwd.users $["local":$["by_uidnumber":$["500":$["hh":"1"]], "hh":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/new/home/hh", "modified":"edited", "org_homedirectory":"/new/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "homes":$["/home/hh":"1"], "last_uid":"500", "uids":$["500":"1"], "usernames":$["hh":"1"]], "system":$["by_uidnumber":$["0":$["root":"1"]], "homes":$[], "last_uid":"0", "root":$["uid":"root", "uidnumber":"0"], "uids":$["0":"1"], "usernames":$["root":"1"]]] true
+Write .target.string "/etc/passwd" "at:x:25:25:Batch jobs daemon:/var/spool/atjobs:/bin/bash\nbin:x:1:1:bin:/bin:/bin/bash\ndaemon:x:2:2:Daemon:/sbin:/bin/bash\nmail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false\nnobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash\nroot:x:0:0:root:/root:/bin/bash\nuucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash\nhh:x:501:100:HaHa:/new/home/hh:/bin/bash\nii:x:555:100:Test user:/home/ii:/bin/bash\n+::::::\n" true
Read .target.stat "/new/home" $[]
Execute .target.mkdir "/new/home" 0
Read .target.stat "/new/home/hh" $[]
Read .target.stat "/home/hh" $[]
Read .target.stat "/new/home/hh" $[]
Execute .target.bash "/bin/cp /etc/shadow /etc/shadow.YaST2save" 0
-Write .passwd.shadow $["local":$["hh":$["userpassword":"secret"]], "system":$[]] true
+Write .target.string "/etc/shadow" "at:!:13636:0:99999:7:::\nbin:*:13636::::::\ndaemon:*:13636::::::\nmail:*:13636::::::\nnobody:*:13636::::::\nroot:password:13636::::::\nuucp:*:13636::::::\nhh:heslo:13727:0:99999:7:::\n+::0:0:0::::\n" true
Execute .target.bash "/usr/sbin/nscd -i passwd" 0
Return
Dump ==========================================================
Copied: trunk/users/testsuite/tests/EditUser.ycp (from r40377, trunk/users/testsuite/tests/EditUser.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.ycp?p2=trunk/users/testsuite/tests/EditUser.ycp&p1=trunk/users/testsuite/tests/EditUser.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUser.ycp.disabled (original)
+++ trunk/users/testsuite/tests/EditUser.ycp Tue Aug 21 17:04:59 2007
@@ -14,106 +14,22 @@
*/
{
- // testedfiles: Users.pm UsersLDAP.pm UsersCache.pm
+ // testedfiles: Users.pm UsersPasswd.pm
- include "testsuite.ycp";
- import "Users";
+ import "Directory";
import "Mode";
+ import "Users";
+ import "UsersPasswd";
+
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "uidnumber" : 500,
- "type" : "local",
- "userpassword" : nil,
- "sn" : "HH",
- "grouplist" : $[
- "users" : 1
- ],
- "homedirectory" : "/home/hh",
- ],
- "by_uidnumber": $[
- 500 : $[ "hh": 1],
- ],
- "last_uid": 500,
- "homes": $[
- "/home/hh": 1,
- ],
- "usernames": $[
- "hh": 1,
- ],
- "uids": $[
- 500: 1,
- ]
- ],
- "shadow": $[
- "hh" : $[
- "userpassword" : "secret",
- ]
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidnumber": 100,
- "type" : "local",
- "userlist" : $[
- "hh": 1
- ],
- ],
- "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",
- "uidnumber" : 0,
- "gidnumber" : 0,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 0 : $["root":1],
- ],
- "gids": $[
- 0 : 1
- ],
- "groupnames": $[
- "root" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -159,62 +75,67 @@
],
];
- DUMP ("==========================================================");
+ import "Testsuite";
+
+ Testsuite::Dump ("==========================================================");
Mode::SetTest ("test");
- TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
// for home directory checks
READ["target","stat","isdir"] = true;
Users::SelectUserByName ("hh");
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
map<string,any> changes = $[
"uidnumber" : 501,
];
- TEST (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
EXEC ["target", "bash_output", "stdout"] = "hh";
- string error = (string) TEST(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
- DUMP (sformat ("---- check user after edit:\n %1", error));
+ string error = (string) Testsuite::Test(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
+ Testsuite::Dump (sformat ("---- check user after edit:\n %1", error));
+
+ Testsuite::Dump ("---- commit user:");
+ Testsuite::Test (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
- DUMP ("---- commit user:");
- TEST (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::SetBaseDirectory ("/etc")), [], 0);
+ Testsuite::Test (``(UsersPasswd::SetBaseDirectory ("/etc")), [], 0);
// home changed its owner because of uid change
- TEST (``(Users::Write ()), [RW, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Write ()), [RW, WRITE, EXEC], 0);
Users::SelectUser (500);
- DUMP (sformat ("---- user 500:\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 500:\n %1", Users::GetCurrentUser ()));
Users::SelectUser (501);
- DUMP (sformat ("---- user 501:\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 501:\n %1", Users::GetCurrentUser ()));
changes = $[
"homedirectory" : "/new/home/hh",
];
- TEST (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
- error = (string) TEST(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
- DUMP (sformat ("---- check user after edit:\n %1", error));
+ error = (string) Testsuite::Test(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
+ Testsuite::Dump (sformat ("---- check user after edit:\n %1", error));
- DUMP ("---- commit user:");
- TEST (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Dump ("---- commit user:");
+ Testsuite::Test (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
// home directory was changed -> move it
READ ["target", "stat"] = $[];
- TEST (``(Users::Write ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Write ()), [READ, WRITE, EXEC], 0);
- DUMP ("==========================================================");
+ Testsuite::Dump ("==========================================================");
}
Modified: trunk/users/testsuite/tests/EditUsersGroups.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUsersGroups.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUsersGroups.out (original)
+++ trunk/users/testsuite/tests/EditUsersGroups.out Tue Aug 21 17:04:59 2007
@@ -9,42 +9,21 @@
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":$["gidnumber":100, "grouplist":$["ggl":1], "type":"local", "uid":"hh", "uidnumber":500, "userpassword":"password"], "homes":$[], "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], 1000:$["ggl":1]], "ggl":$["cn":"ggl", "gidnumber":1000, "type":"local", "userlist":$["hh":1]], "gids":$[100:1, 1000:1], "groupnames":$["ggl":1, "users":1], "users":$["cn":"users", "gidnumber":100, "more_users":$["hh":1], "type":"local"]]
-Read .passwd.local.groups.by_gidnumber $[100:$["users":1], 1000:$["ggl":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":$[10:$["ggs":1]], "ggs":$["cn":"ggs", "gidnumber":10, "type":"system"], "gids":$[10:1], "groupnames":$["ggs":1]]
-Read .passwd.system.groups.by_gidnumber $[10:$["ggs":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 $[]
-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 $[]
-Read .passwd.system.users.uids $[]
-Read .passwd.local.groups.gids $[100:1, 1000:1]
-Read .passwd.local.groups.groupnames $["ggl":1, "users":1]
-Read .passwd.system.groups.gids $[10:1]
-Read .passwd.system.groups.groupnames $["ggs":1]
Return
Return
+Execute .target.bash_output "echo 'ggl' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"ggl"]
+Return
+Return true
+Execute .target.bash_output "grep '^volume hh ' /etc/security/pam_mount.conf | sed -e 's/- //' | cut -f 4 -d ' '" $["stdout":"ggl"]
+Return
Execute .target.bash_output "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"]
Return
Dump ---- unchanged group 'ggl':
-Dump $["cn":"ggl", "gidnumber":"1000", "type":"local", "userlist":$["hh":"1"]]
-Dump ---- unchanged group 'ggs':
-Dump $["cn":"ggs", "gidnumber":"10", "type":"system"]
+Dump $["cn":"ggl", "gidnumber":"555", "modified":"added", "org_cn":"ggl", "org_gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$["hh":"1"], "what":"add_group"]
+Dump ---- unchanged group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"]
Return true
Dump ---- changed group 'ggl':
-Dump $["cn":"ggl", "gidnumber":"1000", "modified":"edited", "org_cn":"ggl", "org_gidnumber":"1000", "type":"local", "userlist":$[], "what":"user_change"]
-Dump ---- changed group 'ggs':
-Dump $["cn":"ggs", "gidnumber":"10", "modified":"edited", "org_cn":"ggs", "org_gidnumber":"10", "type":"system", "userlist":$["hh":"1"], "what":"user_change"]
+Dump $["cn":"ggl", "gidnumber":"555", "modified":"added", "org_cn":"ggl", "org_gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$[], "what":"user_change"]
+Dump ---- changed group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidnumber":"17", "type":"system", "userlist":$["hh":"1", "ii":"1"], "userpassword":"x", "what":"user_change"]
Copied: trunk/users/testsuite/tests/EditUsersGroups.ycp (from r40377, trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUsersGroups.ycp?p2=trunk/users/testsuite/tests/EditUsersGroups.ycp&p1=trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled (original)
+++ trunk/users/testsuite/tests/EditUsersGroups.ycp Tue Aug 21 17:04:59 2007
@@ -9,98 +9,19 @@
{
// testedfiles: Users.pm
- import "Users";
+ import "Directory";
import "Mode";
- import "Testsuite";
+ import "Users";
+
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "uidnumber" : 500,
- "type" : "local",
- "userpassword" : "password",
- "gidnumber": 100,
- "grouplist" : $[
- "ggl" : 1
- ],
- ],
- "by_uidnumber": $[
- 500 : $[ "hh": 1],
- ],
- "last_uid": 500,
- "homes": $[
- ],
- "usernames": $[
- "hh": 1,
- ],
- "uids": $[
- 500: 1,
- ]
- ],
- "shadow": $[
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidnumber": 100,
- "type" : "local",
- "more_users" : $[
- "hh": 1
- ],
- ],
- "ggl": $[
- "cn" : "ggl",
- "gidnumber": 1000,
- "type" : "local",
- "userlist": $[
- "hh": 1
- ]
- ],
- "by_gidnumber": $[
- 100 : $["users":1],
- 1000 : $["ggl":1],
- ],
- "gids": $[
- 100 : 1,
- 1000 : 1,
- ],
- "groupnames": $[
- "users" : 1,
- "ggl" : 1,
- ]
- ],
- ],
- "system": $[
- "users": $[
- "by_uidnumber" : $[],
- "last_uid" : 0,
- "homes" : $[],
- "usernames" : $[],
- "uids" : $[],
- ],
- "shadow": $[
- ],
- "groups": $[
- "ggs": $[
- "cn" : "ggs",
- "gidnumber" : 10,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 10 : $["ggs":1],
- ],
- "gids": $[
- 10 : 1
- ],
- "groupnames": $[
- "ggs" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -135,14 +56,35 @@
],
"target" : $[
"bash" : 0,
- "bash_output" : $[],
+ "bash_output" : $[
+ "stdout": "",
+ ],
],
];
+ import "Testsuite";
+
Mode::SetTest ("test");
Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ map <string,any> group = $[
+ "gidnumber" : 555,
+ "cn" : "ggl",
+ "userlist" : $[ "hh" : 1 ],
+ "password" :"x",
+ "type" : "local",
+ "what" : "add_group"
+ ];
+
+ Testsuite::Test (``(Users::AddGroup (group)), [READ, WRITE, EXEC], 0);
+
+ EXEC ["target", "bash_output", "stdout"] = "ggl";
+
+ Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Test(``(Users::CommitGroup ()), [READ, WRITE, EXEC], 0);
+
// for home directory checks
READ["target","stat","isdir"] = true;
@@ -150,7 +92,7 @@
map<string,any> changes = $[
"grouplist" : $[
- "ggs" : 1,
+ "audio" : 1,
]
];
@@ -162,11 +104,11 @@
Testsuite::Dump (sformat ("---- unchanged group 'ggl':\n %1", Users::GetGroupByName ("ggl", "")));
- Testsuite::Dump (sformat ("---- unchanged group 'ggs':\n %1", Users::GetGroupByName ("ggs", "")));
+ Testsuite::Dump (sformat ("---- unchanged group 'audio':\n %1", Users::GetGroupByName ("audio", "")));
Testsuite::Test (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
Testsuite::Dump (sformat ("---- changed group 'ggl':\n %1", Users::GetGroupByName ("ggl", "")));
- Testsuite::Dump (sformat ("---- changed group 'ggs':\n %1", Users::GetGroupByName ("ggs", "")));
+ Testsuite::Dump (sformat ("---- changed group 'audio':\n %1", Users::GetGroupByName ("audio", "")));
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
Date: Tue Aug 21 17:04:59 2007
New Revision: 40382
URL: http://svn.opensuse.org/viewcvs/yast?rev=40382&view=rev
Log:
enable testsuite again
Added:
trunk/users/testsuite/group
trunk/users/testsuite/passwd
trunk/users/testsuite/shadow
trunk/users/testsuite/tests/AddGroup.ycp (with props)
trunk/users/testsuite/tests/AddUser.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/AddUser.ycp.disabled
trunk/users/testsuite/tests/BuildAdditional.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/BuildAdditional.ycp.disabled
trunk/users/testsuite/tests/DeleteUser.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/DeleteUser.ycp.disabled
trunk/users/testsuite/tests/EditUser.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/EditUser.ycp.disabled
trunk/users/testsuite/tests/EditUsersGroups.ycp
- copied, changed from r40377, trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled
Removed:
trunk/users/testsuite/tests/AddGroup.ycp.disabled
trunk/users/testsuite/tests/AddUser.ycp.disabled
trunk/users/testsuite/tests/BuildAdditional.ycp.disabled
trunk/users/testsuite/tests/DeleteUser.ycp.disabled
trunk/users/testsuite/tests/EditUser.ycp.disabled
trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled
Modified:
trunk/users/testsuite/Makefile.am
trunk/users/testsuite/tests/AddGroup.out
trunk/users/testsuite/tests/AddUser.out
trunk/users/testsuite/tests/BuildAdditional.out
trunk/users/testsuite/tests/DeleteUser.out
trunk/users/testsuite/tests/EditUser.out
trunk/users/testsuite/tests/EditUsersGroups.out
Modified: trunk/users/testsuite/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/Makefile.am?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/Makefile.am (original)
+++ trunk/users/testsuite/Makefile.am Tue Aug 21 17:04:59 2007
@@ -5,7 +5,7 @@
#
AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
+EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) passwd shadow group
testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
Added: trunk/users/testsuite/group
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/group?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/group (added)
+++ trunk/users/testsuite/group Tue Aug 21 17:04:59 2007
@@ -0,0 +1,5 @@
+audio:x:17:ii
+nobody:x:65533:
+root:x:0:
+users:x:100:
++:::
Added: trunk/users/testsuite/passwd
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/passwd?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/passwd (added)
+++ trunk/users/testsuite/passwd Tue Aug 21 17:04:59 2007
@@ -0,0 +1,10 @@
+at:x:25:25:Batch jobs daemon:/var/spool/atjobs:/bin/bash
+bin:x:1:1:bin:/bin:/bin/bash
+daemon:x:2:2:Daemon:/sbin:/bin/bash
+mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
+nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
+root:x:0:0:root:/root:/bin/bash
+hh:x:500:100:HaHa:/home/hh:/bin/bash
+ii:x:555:100:Test user:/home/ii:/bin/bash
+uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
++::::::
Added: trunk/users/testsuite/shadow
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/shadow?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/shadow (added)
+++ trunk/users/testsuite/shadow Tue Aug 21 17:04:59 2007
@@ -0,0 +1,9 @@
+at:!:13636:0:99999:7:::
+bin:*:13636::::::
+daemon:*:13636::::::
+mail:*:13636::::::
+nobody:*:13636::::::
+root:password:13636::::::
+hh:heslo:13727:0:99999:7:::
+uucp:*:13636::::::
++::0:0:0::::
Modified: trunk/users/testsuite/tests/AddGroup.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddGroup.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/AddGroup.out (original)
+++ trunk/users/testsuite/tests/AddGroup.out Tue Aug 21 17:04:59 2007
@@ -7,41 +7,12 @@
Read .etc.default.useradd."shell" 0
Read .etc.default.useradd."skel" 0
Read .target.string "/etc/shells" 0
-Read .target.stat "0" $[]
Read .etc.nsswitch_conf.passwd 0
-Read .target.stat "/usr/lib/yp/yphelper" $[]
Read .etc.nsswitch_conf.passwd 0
-Read .target.stat "/var/lib/YaST2/users.ycp" $[]
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":$["gecos":"HaHa", "gidnumber":100, "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":$[], "homes":$[], "last_uid":0, "uids":$[], "usernames":$[]]
-Read .passwd.system.users.by_uidnumber $[]
-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 ["+"]
-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 $[]
-Read .passwd.system.users.uids $[]
-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
Dump local user names:
-Dump ["hh"]
+Dump ["hh", "ii"]
Dump local group names:
Dump ["users"]
Dump ---- current group:
@@ -57,10 +28,10 @@
Dump ---- check group after add:
Dump
Dump ---- user 'hh':
-Dump $["gecos":"HaHa", "gidnumber":"100", "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"]
Return true
Dump ---- user 'hh':
-Dump $["gecos":"HaHa", "gidnumber":"100", "grouplist":$["testgrp":"1"], "org_uid":"hh", "org_uidnumber":"500", "type":"local", "uid":"hh", "uidnumber":"500", "what":"group_change"]
+Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$["testgrp":"1"], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"500", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo", "what":"group_change"]
Dump ==========================================================
Dump local group names:
Dump ["testgrp", "users"]
Added: trunk/users/testsuite/tests/AddGroup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddGroup.ycp?rev=40382&view=auto
==============================================================================
--- trunk/users/testsuite/tests/AddGroup.ycp (added)
+++ trunk/users/testsuite/tests/AddGroup.ycp Tue Aug 21 17:04:59 2007
@@ -0,0 +1,171 @@
+/**
+ * File:
+ * AddGroup.ycp
+ *
+ * Module:
+ * Users configurator
+ *
+ * Summary:
+ * Saving group tests.
+ *
+ * Authors:
+ * Jiri Suchomel <jsuchome@xxxxxxx>
+ *
+ */
+
+{
+ // testedfiles: Users.pm
+
+ import "Directory";
+ import "Users";
+ import "UsersCache";
+ import "Mode";
+ import "Directory";
+ import "Progress";
+ import "Report";
+
+ // we need to read the real data from the system, not given in map for
+ // dummy agent
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+ // passwd etc. read, now we can switch to the test mode
+
+ map READ = $[
+ "product": $[
+ "features": $[
+ "USE_DESKTOP_SCHEDULER" : "no",
+ "ENABLE_AUTOLOGIN" : "false",
+ "IO_SCHEDULER" : "",
+ "EVMS_CONFIG" : "no",
+ "UI_MODE" : "simple",
+ "INCOMPLETE_TRANSLATION_TRESHOLD" : "99",
+ ]
+ ],
+ "etc" : $[
+ "fstab": [],
+ "cryptotab": [],
+ "default": $[
+ "useradd": $[
+ "home": "/home",
+ "groups": "audio,video",
+ "group": 100
+ ]
+ ],
+ ],
+ "target": $[
+ "size" : -1,
+ "stat" : $[],
+ ],
+ /* To simulate NIS server, use target.size = 0 and this:
+ "sysconfig": $[
+ "ypserv" : $[
+ "YPPWD_SRCDIR" : "/etc"
+ ]
+ ],
+ */
+ ];
+
+ map WRITE = $[];
+ map EXEC = $[
+ "passwd" : $[
+ "init" : true
+ ],
+ "target" : $[
+ "bash" : 0,
+ "bash_output":$[
+ "stdout": "",
+ ],
+ ],
+ ];
+
+ Mode::SetTest ("test");
+
+ import "Testsuite";
+
+ Testsuite::Dump ("==========================================================");
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
+ Testsuite::Dump ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+ Testsuite::Dump (sformat ("---- current group:\n %1", Users::GetCurrentGroup ()));
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- current group (empty add, to get default values):\n %1", Users::GetCurrentGroup ()));
+
+ map <string,any> group = $[
+ "gidnumber" : 555,
+ "cn" : "testgrp",
+ "userlist" : $[ "hh" : 1 ],
+ "password" :"x",
+ "type" : "local",
+ "what" : "add_group"
+ ];
+
+ Testsuite::Test (``(Users::AddGroup (group)), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- current group (after rich add):\n %1", Users::GetCurrentGroup ()));
+
+ EXEC ["target", "bash_output", "stdout"] = "testgrp";
+
+ string error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+
+ Users::SelectUserByName ("hh");
+
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+
+ Testsuite::Test(``(Users::CommitGroup ()), [READ, WRITE, EXEC], 0);
+
+ Users::SelectUserByName ("hh");
+
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+
+ Testsuite::Dump ("==========================================================");
+
+ Testsuite::Dump ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+
+ Testsuite::Dump ("================= gid conflict (not fatal any more) ======");
+
+ EXEC ["target", "bash_output", "stdout"] = "new";
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::AddGroup ($[ "cn" : "new", "gidnumber": 0, "type": "system"])),
+ [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- current group after add:\n %1", Users::GetCurrentGroup ()));
+
+ error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+
+ Testsuite::Dump ("================= name conflict ==========================");
+
+ EXEC ["target", "bash_output", "stdout"] = "testgrp";
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::AddGroup ($[ "cn" : "testgrp"])), [], 0);
+
+ Testsuite::Dump (sformat ("---- current group after add):\n %1", Users::GetCurrentGroup ()));
+
+ error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+
+ Testsuite::Dump ("================= name too short =========================");
+
+ Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::AddGroup ($[ "cn" : "t"])), [], 0);
+
+ Testsuite::Dump (sformat ("---- current group after add:\n %1", Users::GetCurrentGroup ()));
+
+ error = (string) Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump (sformat ("---- check group after add:\n %1", error));
+}
Modified: trunk/users/testsuite/tests/AddUser.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddUser.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/AddUser.out (original)
+++ trunk/users/testsuite/tests/AddUser.out Tue Aug 21 17:04:59 2007
@@ -10,32 +10,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", "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]], "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"]
Return
Dump ---- current user:
Dump $[]
@@ -48,13 +22,13 @@
Execute .target.bash_output "echo 'aaa' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"aaa"]
Return
Dump ---- current group (before user commit):
-Dump $["cn":"users", "gidnumber":"100", "type":"local"]
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userlist":$[], "userpassword":"x"]
Dump ---- check user after add:
Dump
Dump ---- commit user:
Return true
Dump ---- current group (afer user commit):
-Dump $["cn":"users", "gidnumber":"100", "more_users":$["aaa":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "what":"user_change_default"]
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["aaa":"1", "hh":"1", "ii":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "userlist":$[], "userpassword":"x", "what":"user_change_default"]
Dump =================== no password ==========================
Return
Return
@@ -74,7 +48,7 @@
Return There is a conflict between the entered
Dump ---- check user after add:
Dump There is a conflict between the entered
-Dump username and an existing username.
+Dump username and an existing username.
Dump Try another one.
Dump ==================== uidnumber problems ===================
Return
Copied: trunk/users/testsuite/tests/AddUser.ycp (from r40377, trunk/users/testsuite/tests/AddUser.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddUser.ycp?p2=trunk/users/testsuite/tests/AddUser.ycp&p1=trunk/users/testsuite/tests/AddUser.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/AddUser.ycp.disabled (original)
+++ trunk/users/testsuite/tests/AddUser.ycp Tue Aug 21 17:04:59 2007
@@ -16,7 +16,7 @@
{
// testedfiles: Users.pm UsersLDAP.pm UsersCache.pm
- import "Testsuite";
+ import "Directory";
import "Users";
import "UsersCache";
import "UsersLDAP";
@@ -24,86 +24,15 @@
import "Progress";
import "Report";
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "uidnumber" : 500
- ],
- "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": [],
@@ -142,14 +71,14 @@
],
];
- Testsuite::Dump ("==========================================================");
+ import "Testsuite";
+ Testsuite::Dump ("==========================================================");
Mode::SetTest ("test");
Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
Testsuite::Dump (sformat ("---- current user:\n %1", Users::GetCurrentUser ()));
-
Testsuite::Test (``(Users::AddUser ($[])), [READ, WRITE, EXEC], 0);
Testsuite::Dump (sformat ("---- current user (empty add):\n %1", Users::GetCurrentUser ()));
Modified: trunk/users/testsuite/tests/BuildAdditional.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/BuildAdditional.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/BuildAdditional.out (original)
+++ trunk/users/testsuite/tests/BuildAdditional.out Tue Aug 21 17:04:59 2007
@@ -10,35 +10,9 @@
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], 600:$["ii":1]], "hh":$["gecos":"HaHa", "gidnumber":100, "uid":"hh", "uidnumber":500], "homes":$["/home/hh":1], "ii":$["gecos":"Ia", "gidnumber":100, "uid":"ii", "uidnumber":600], "last_uid":600, "uids":$[500:1, 600:1], "usernames":$["hh":1, "ii":1]]
-Read .passwd.local.users.by_uidnumber $[500:$["hh":1], 600:$["ii":1]]
-Read .passwd.local.shadow $[]
-Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "by_name":$[], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidNumber":100, "type":"local", "userlist":$["ii":1]]]
-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":$[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 600
-Read .passwd.local.users.homes $["/home/hh":1]
-Read .passwd.local.users.usernames $["hh":1, "ii":1]
-Read .passwd.local.users.uids $[500:1, 600:1]
-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 $[0:1]
-Read .passwd.system.groups.groupnames $["root":1]
Return
Dump ---- current group:
-Dump $["cn":"users", "gidNumber":"100", "type":"local", "userlist":$["ii":"1"]]
+Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"]
Dump ---- create additional users list:
Dump
-Return [`item (`id ("hh"), "hh", false), `item (`id ("ii"), "ii", true)]
+Return [`item (`id ("at"), "at", false), `item (`id ("bin"), "bin", false), `item (`id ("daemon"), "daemon", false), `item (`id ("hh"), "hh", false), `item (`id ("ii"), "ii", true), `item (`id ("mail"), "mail", false), `item (`id ("nobody"), "nobody", false), `item (`id ("root"), "root", false), `item (`id ("uucp"), "uucp", false)]
Copied: trunk/users/testsuite/tests/BuildAdditional.ycp (from r40377, trunk/users/testsuite/tests/BuildAdditional.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/BuildAdditional.ycp?p2=trunk/users/testsuite/tests/BuildAdditional.ycp&p1=trunk/users/testsuite/tests/BuildAdditional.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/BuildAdditional.ycp.disabled (original)
+++ trunk/users/testsuite/tests/BuildAdditional.ycp Tue Aug 21 17:04:59 2007
@@ -1,7 +1,6 @@
{
// testedfiles: Users.pm UserCache.pm
- include "testsuite.ycp";
import "Users";
import "UsersCache";
import "Mode";
@@ -9,90 +8,18 @@
import "Progress";
import "Report";
+ // we need to read the real data from the system, not given in map for
+ // dummy agent
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+ // passwd etc. read, now we can switch to the test mode
+
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "gecos" : "HaHa",
- "gidnumber" : 100,
- "uidnumber" : 500
- ],
- "ii": $[
- "uid" : "ii",
- "gecos" : "Ia",
- "gidnumber" : 100,
- "uidnumber" : 600
- ],
- "by_uidnumber": $[
- 500 : $[ "hh" : 1 ],
- 600 : $[ "ii" : 1 ],
- ],
- "last_uid": 600,
- "homes": $[
- "/home/hh": 1,
- ],
- "usernames": $[
- "hh": 1,
- "ii": 1,
- ],
- "uids": $[
- 500: 1,
- 600: 1
- ]
- ],
- "shadow": $[
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidNumber": 100,
- "type" : "local",
- "userlist" : $[ "ii" : 1 ],
- ],
- "by_gidnumber": $[
- 100 : $[ "users" : 1 ],
- ],
- "by_name": $[
- ],
- "gids": $[
- 100: 1,
- ],
- "groupnames": $[
- "users": 1,
- ]
- ],
- ],
- "system": $[
- "users": $[
- "by_uidnumber": $[
- ],
- "last_uid": 0,
- "homes": $[],
- "usernames": $[],
- "uids": $[],
- ],
- "shadow": $[
- ],
- "groups": $[
- "root": $[
- "cn": "root",
- "gidNumber": 0,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 0 : $[ "root" : 1]
- ],
- "gids": $[
- 0 : 1
- ],
- "groupnames": $[
- "root" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -130,20 +57,21 @@
],
];
- DUMP ("==========================================================");
+ import "Testsuite";
+ Testsuite::Dump ("==========================================================");
Mode::SetTest ("test");
- TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
- Users::SelectGroupByName ("users");
+ Users::SelectGroupByName ("audio");
map <string,any> group = Users::GetCurrentGroup ();
- DUMP (sformat ("---- current group:\n %1", group));
-
- DUMP ("---- create additional users list:\n");
+ Testsuite::Dump (sformat ("---- current group:\n %1", group));
- list additional = (list)
- TEST(``(UsersCache::BuildAdditional (group)), [ READ, WRITE], 0);
+ // only 'ii' is checked ('true' in the item)
+ Testsuite::Dump ("---- create additional users list:\n");
+ list additional = (list) Testsuite::Test (
+ ``(UsersCache::BuildAdditional (group)), [ READ, WRITE], 0);
}
Modified: trunk/users/testsuite/tests/DeleteUser.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/DeleteUser.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/DeleteUser.out (original)
+++ trunk/users/testsuite/tests/DeleteUser.out Tue Aug 21 17:04:59 2007
@@ -9,49 +9,27 @@
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":$["gecos":"HaHa", "gidnumber":100, "grouplist":$["grp":1], "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 $["hh":$[]]
-Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1], 500:$["grp":1]], "gids":$[100:1, 500:1], "groupnames":$["grp":1, "users":1], "grp":$["cn":"grp", "gidNumber":500, "type":"local", "userlist":$["hh":1]], "users":$["cn":"users", "gidNumber":100, "type":"local"]]
-Read .passwd.local.groups.by_gidnumber $[100:$["users":1], 500:$["grp":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":$[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 $[]
-Read .passwd.system.users.uids $[]
-Read .passwd.local.groups.gids $[100:1, 500:1]
-Read .passwd.local.groups.groupnames $["grp":1, "users":1]
-Read .passwd.system.groups.gids $[0:1]
-Read .passwd.system.groups.groupnames $["root":1]
Return
Dump local users:
-Dump $["hh":$["gecos":"HaHa", "gidnumber":"100", "grouplist":$["grp":"1"], "type":"local", "uid":"hh", "uidnumber":"500"]]
+Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":nil], "ii":$["addit_data":"", "cn":"Test user", "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/home/ii", "loginshell":"/bin/bash", "type":"local", "uid":"ii", "uidnumber":"555", "userpassword":nil]]
Dump local user names:
-Dump ["hh"]
+Dump ["hh", "ii"]
Dump local group names:
-Dump ["grp", "users"]
-Dump ---- user 'hh':
-Dump $["gecos":"HaHa", "gidnumber":"100", "grouplist":$["grp":"1"], "type":"local", "uid":"hh", "uidnumber":"500"]
-Dump ---- group 'grp':
-Dump $["cn":"grp", "gidNumber":"500", "type":"local", "userlist":$["hh":"1"]]
+Dump ["users"]
+Dump ---- user 'ii':
+Dump $["addit_data":"", "cn":"Test user", "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/home/ii", "loginshell":"/bin/bash", "type":"local", "uid":"ii", "uidnumber":"555", "userpassword":nil]
+Dump ---- group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"]
+Dump ---- group 'users':
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userlist":$[], "userpassword":"x"]
Dump ==================== running delete ======================
Return true
Return true
Dump local user names:
-Dump []
+Dump ["hh"]
Dump local users:
-Dump $[]
-Dump ---- group 'grp':
-Dump $["cn":"grp", "gidNumber":"500", "type":"local", "userlist":$[]]
+Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":nil]]
+Dump ---- group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidnumber":"17", "type":"system", "userlist":$[], "userpassword":"x", "what":"user_change"]
+Dump ---- group 'users':
+Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "userlist":$[], "userpassword":"x", "what":"user_change_default"]
Copied: trunk/users/testsuite/tests/DeleteUser.ycp (from r40377, trunk/users/testsuite/tests/DeleteUser.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/DeleteUser.ycp?p2=trunk/users/testsuite/tests/DeleteUser.ycp&p1=trunk/users/testsuite/tests/DeleteUser.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/DeleteUser.ycp.disabled (original)
+++ trunk/users/testsuite/tests/DeleteUser.ycp Tue Aug 21 17:04:59 2007
@@ -16,7 +16,6 @@
{
// testedfiles: Users.pm UsersCache.pm
- include "testsuite.ycp";
import "Users";
import "UsersCache";
import "Mode";
@@ -24,91 +23,15 @@
import "Progress";
import "Report";
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
+
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "gecos" : "HaHa",
- "gidnumber" : 100,
- "uidnumber" : 500,
- "grouplist" : $[ "grp" : 1],
- "type" : "local"
- ],
- "by_uidnumber": $[
- 500 : $[ "hh" : 1 ],
- ],
- "last_uid": 500,
- "homes": $[
- "/home/hh": 1,
- ],
- "usernames": $[
- "hh": 1,
- ],
- "uids": $[
- 500: 1,
- ]
- ],
- "shadow": $[
- "hh": $[
- ]
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidNumber": 100,
- "type" : "local"
- ],
- "grp": $[
- "cn" : "grp",
- "gidNumber": 500,
- "type" : "local",
- "userlist" : $[ "hh" : 1 ],
- ],
- "by_gidnumber": $[
- 100 : $["users":1],
- 500 : $[ "grp" :1],
- ],
- "gids": $[
- 100: 1,
- 500: 1,
- ],
- "groupnames": $[
- "users" : 1,
- "grp" : 1,
- ]
- ],
- ],
- "system": $[
- "users": $[
- "by_uidnumber": $[
- ],
- "last_uid": 0,
- "homes": $[],
- "usernames": $[],
- "uids": $[],
- ],
- "shadow": $[
- ],
- "groups": $[
- "root": $[
- "cn": "root",
- "gidNumber": 0,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 0 : $[ "root" : 1 ],
- ],
- "gids": $[
- 0 : 1
- ],
- "groupnames": $[
- "root" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -146,34 +69,41 @@
],
];
+ import "Testsuite";
+
Mode::SetTest ("test");
- TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Dump ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
- DUMP ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
+ Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
+ Testsuite::Dump ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+ Users::SelectUserByName ("ii");
- DUMP ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
- DUMP ( sformat ("local group names:\n %1", UsersCache::GetGroupnames ("local")));
+ Testsuite::Dump (sformat ("---- user 'ii':\n %1", Users::GetCurrentUser ()));
- Users::SelectUserByName ("hh");
+ Users::SelectGroupByName ("audio");
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- group 'audio':\n %1", Users::GetCurrentGroup ()));
- Users::SelectGroupByName ("grp");
+ Users::SelectGroupByName ("users");
- DUMP (sformat ("---- group 'grp':\n %1", Users::GetCurrentGroup ()));
+ Testsuite::Dump (sformat ("---- group 'users':\n %1", Users::GetCurrentGroup ()));
+ Testsuite::Dump ("==================== running delete ======================");
- DUMP ("==================== running delete ======================");
+ Testsuite::Test(``(Users::DeleteUser (true)), [], 0);
+ Testsuite::Test(``(Users::CommitUser ()), [], 0);
- TEST(``(Users::DeleteUser (true)), [], 0);
- TEST(``(Users::CommitUser ()), [], 0);
+ Testsuite::Dump ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
+ Testsuite::Dump ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
- DUMP ( sformat ("local user names:\n %1", UsersCache::GetUsernames ("local")));
- DUMP ( sformat ("local users:\n %1", Users::GetUsers ("uid", "local")));
+ Users::SelectGroupByName ("audio");
- Users::SelectGroupByName ("grp");
+ Testsuite::Dump (sformat ("---- group 'audio':\n %1", Users::GetCurrentGroup ()));
- DUMP (sformat ("---- group 'grp':\n %1", Users::GetCurrentGroup ()));
+ Users::SelectGroupByName ("users");
+ Testsuite::Dump (sformat ("---- group 'users':\n %1", Users::GetCurrentGroup ()));
}
Modified: trunk/users/testsuite/tests/EditUser.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUser.out (original)
+++ trunk/users/testsuite/tests/EditUser.out Tue Aug 21 17:04:59 2007
@@ -10,62 +10,40 @@
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":$["grouplist":$["users":1], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":500, "userpassword":nil], "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 $["hh":$["userpassword":"secret"]]
-Read .passwd.local.groups $["by_gidnumber":$[100:$["users":1]], "gids":$[100:1], "groupnames":$["users":1], "users":$["cn":"users", "gidnumber":100, "type":"local", "userlist":$["hh":1]]]
-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", "uidnumber":0]]
-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]
Return
Dump ---- user 'hh':
-Dump $["grouplist":$["users":"1"], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"secret"]
+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 ' '" $[]
Return
Dump ---- user 'hh':
-Dump $["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_uidnumber":"500", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"secret"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"]
+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_uidnumber":"500", "org_user":$["addit_data":"", "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "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"], "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 "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"]
Return
Dump ---- check user after edit:
Dump
Dump ---- commit user:
Return true
+Return nil
+Return nil
Execute .target.bash "/bin/cp /etc/passwd /etc/passwd.YaST2save" 0
-Write .passwd.users $["local":$["by_uidnumber":$["500":$["hh":"1"]], "hh":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "modified":"edited", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"secret"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "homes":$["/home/hh":"1"], "last_uid":"500", "uids":$["500":"1"], "usernames":$["hh":"1"]], "system":$["by_uidnumber":$["0":$["root":"1"]], "homes":$[], "last_uid":"0", "root":$["uid":"root", "uidnumber":"0"], "uids":$["0":"1"], "usernames":$["root":"1"]]] true
+Write .target.string "/etc/passwd" "at:x:25:25:Batch jobs daemon:/var/spool/atjobs:/bin/bash\nbin:x:1:1:bin:/bin:/bin/bash\ndaemon:x:2:2:Daemon:/sbin:/bin/bash\nmail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false\nnobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash\nroot:x:0:0:root:/root:/bin/bash\nuucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash\nhh:x:501:100:HaHa:/home/hh:/bin/bash\nii:x:555:100:Test user:/home/ii:/bin/bash\n+::::::\n" true
Read .target.stat "/home" $["isdir":true]
Read .target.stat "/home/hh" $["isdir":true]
Read .target.stat "/home/hh" $["isdir":true]
-Execute .target.bash_output "/bin/chown -R 501: /home/hh" $["stdout":"hh"]
+Execute .target.bash_output "/bin/chown -R 501:100 /home/hh" $["stdout":"hh"]
Execute .target.bash "/bin/cp /etc/shadow /etc/shadow.YaST2save" 0
-Write .passwd.shadow $["local":$["hh":$["userpassword":"secret"]], "system":$[]] true
+Write .target.string "/etc/shadow" "at:!:13636:0:99999:7:::\nbin:*:13636::::::\ndaemon:*:13636::::::\nmail:*:13636::::::\nnobody:*:13636::::::\nroot:password:13636::::::\nuucp:*:13636::::::\nhh:heslo:13727:0:99999:7:::\n+::0:0:0::::\n" true
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
Dump ---- user 500:
Dump $[]
Dump ---- user 501:
-Dump $["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"]
+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"]
Return
Dump ---- user 'hh':
-Dump $["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/new/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"]
+Dump $["addit_data":"", "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/new/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["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"], "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 "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"]
Return
Dump ---- check user after edit:
@@ -73,14 +51,14 @@
Dump ---- commit user:
Return true
Execute .target.bash "/bin/cp /etc/passwd /etc/passwd.YaST2save" 0
-Write .passwd.users $["local":$["by_uidnumber":$["500":$["hh":"1"]], "hh":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/new/home/hh", "modified":"edited", "org_homedirectory":"/new/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["create_home":true, "encrypted":true, "grouplist":$["users":"1"], "homedirectory":"/home/hh", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "plugins":[], "sn":"HH", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"secret", "what":"edit_user"], "homes":$["/home/hh":"1"], "last_uid":"500", "uids":$["500":"1"], "usernames":$["hh":"1"]], "system":$["by_uidnumber":$["0":$["root":"1"]], "homes":$[], "last_uid":"0", "root":$["uid":"root", "uidnumber":"0"], "uids":$["0":"1"], "usernames":$["root":"1"]]] true
+Write .target.string "/etc/passwd" "at:x:25:25:Batch jobs daemon:/var/spool/atjobs:/bin/bash\nbin:x:1:1:bin:/bin:/bin/bash\ndaemon:x:2:2:Daemon:/sbin:/bin/bash\nmail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false\nnobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash\nroot:x:0:0:root:/root:/bin/bash\nuucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash\nhh:x:501:100:HaHa:/new/home/hh:/bin/bash\nii:x:555:100:Test user:/home/ii:/bin/bash\n+::::::\n" true
Read .target.stat "/new/home" $[]
Execute .target.mkdir "/new/home" 0
Read .target.stat "/new/home/hh" $[]
Read .target.stat "/home/hh" $[]
Read .target.stat "/new/home/hh" $[]
Execute .target.bash "/bin/cp /etc/shadow /etc/shadow.YaST2save" 0
-Write .passwd.shadow $["local":$["hh":$["userpassword":"secret"]], "system":$[]] true
+Write .target.string "/etc/shadow" "at:!:13636:0:99999:7:::\nbin:*:13636::::::\ndaemon:*:13636::::::\nmail:*:13636::::::\nnobody:*:13636::::::\nroot:password:13636::::::\nuucp:*:13636::::::\nhh:heslo:13727:0:99999:7:::\n+::0:0:0::::\n" true
Execute .target.bash "/usr/sbin/nscd -i passwd" 0
Return
Dump ==========================================================
Copied: trunk/users/testsuite/tests/EditUser.ycp (from r40377, trunk/users/testsuite/tests/EditUser.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.ycp?p2=trunk/users/testsuite/tests/EditUser.ycp&p1=trunk/users/testsuite/tests/EditUser.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUser.ycp.disabled (original)
+++ trunk/users/testsuite/tests/EditUser.ycp Tue Aug 21 17:04:59 2007
@@ -14,106 +14,22 @@
*/
{
- // testedfiles: Users.pm UsersLDAP.pm UsersCache.pm
+ // testedfiles: Users.pm UsersPasswd.pm
- include "testsuite.ycp";
- import "Users";
+ import "Directory";
import "Mode";
+ import "Users";
+ import "UsersPasswd";
+
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "uidnumber" : 500,
- "type" : "local",
- "userpassword" : nil,
- "sn" : "HH",
- "grouplist" : $[
- "users" : 1
- ],
- "homedirectory" : "/home/hh",
- ],
- "by_uidnumber": $[
- 500 : $[ "hh": 1],
- ],
- "last_uid": 500,
- "homes": $[
- "/home/hh": 1,
- ],
- "usernames": $[
- "hh": 1,
- ],
- "uids": $[
- 500: 1,
- ]
- ],
- "shadow": $[
- "hh" : $[
- "userpassword" : "secret",
- ]
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidnumber": 100,
- "type" : "local",
- "userlist" : $[
- "hh": 1
- ],
- ],
- "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",
- "uidnumber" : 0,
- "gidnumber" : 0,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 0 : $["root":1],
- ],
- "gids": $[
- 0 : 1
- ],
- "groupnames": $[
- "root" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -159,62 +75,67 @@
],
];
- DUMP ("==========================================================");
+ import "Testsuite";
+
+ Testsuite::Dump ("==========================================================");
Mode::SetTest ("test");
- TEST (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
// for home directory checks
READ["target","stat","isdir"] = true;
Users::SelectUserByName ("hh");
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
map<string,any> changes = $[
"uidnumber" : 501,
];
- TEST (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
EXEC ["target", "bash_output", "stdout"] = "hh";
- string error = (string) TEST(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
- DUMP (sformat ("---- check user after edit:\n %1", error));
+ string error = (string) Testsuite::Test(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
+ Testsuite::Dump (sformat ("---- check user after edit:\n %1", error));
+
+ Testsuite::Dump ("---- commit user:");
+ Testsuite::Test (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
- DUMP ("---- commit user:");
- TEST (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::SetBaseDirectory ("/etc")), [], 0);
+ Testsuite::Test (``(UsersPasswd::SetBaseDirectory ("/etc")), [], 0);
// home changed its owner because of uid change
- TEST (``(Users::Write ()), [RW, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Write ()), [RW, WRITE, EXEC], 0);
Users::SelectUser (500);
- DUMP (sformat ("---- user 500:\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 500:\n %1", Users::GetCurrentUser ()));
Users::SelectUser (501);
- DUMP (sformat ("---- user 501:\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 501:\n %1", Users::GetCurrentUser ()));
changes = $[
"homedirectory" : "/new/home/hh",
];
- TEST (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0);
- DUMP (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
+ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ()));
- error = (string) TEST(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
- DUMP (sformat ("---- check user after edit:\n %1", error));
+ error = (string) Testsuite::Test(``(Users::CheckUser ($[])), [READ,WRITE,EXEC], 0);
+ Testsuite::Dump (sformat ("---- check user after edit:\n %1", error));
- DUMP ("---- commit user:");
- TEST (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Dump ("---- commit user:");
+ Testsuite::Test (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
// home directory was changed -> move it
READ ["target", "stat"] = $[];
- TEST (``(Users::Write ()), [READ, WRITE, EXEC], 0);
+ Testsuite::Test (``(Users::Write ()), [READ, WRITE, EXEC], 0);
- DUMP ("==========================================================");
+ Testsuite::Dump ("==========================================================");
}
Modified: trunk/users/testsuite/tests/EditUsersGroups.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUsersGroups.out?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUsersGroups.out (original)
+++ trunk/users/testsuite/tests/EditUsersGroups.out Tue Aug 21 17:04:59 2007
@@ -9,42 +9,21 @@
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":$["gidnumber":100, "grouplist":$["ggl":1], "type":"local", "uid":"hh", "uidnumber":500, "userpassword":"password"], "homes":$[], "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], 1000:$["ggl":1]], "ggl":$["cn":"ggl", "gidnumber":1000, "type":"local", "userlist":$["hh":1]], "gids":$[100:1, 1000:1], "groupnames":$["ggl":1, "users":1], "users":$["cn":"users", "gidnumber":100, "more_users":$["hh":1], "type":"local"]]
-Read .passwd.local.groups.by_gidnumber $[100:$["users":1], 1000:$["ggl":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":$[10:$["ggs":1]], "ggs":$["cn":"ggs", "gidnumber":10, "type":"system"], "gids":$[10:1], "groupnames":$["ggs":1]]
-Read .passwd.system.groups.by_gidnumber $[10:$["ggs":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 $[]
-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 $[]
-Read .passwd.system.users.uids $[]
-Read .passwd.local.groups.gids $[100:1, 1000:1]
-Read .passwd.local.groups.groupnames $["ggl":1, "users":1]
-Read .passwd.system.groups.gids $[10:1]
-Read .passwd.system.groups.groupnames $["ggs":1]
Return
Return
+Execute .target.bash_output "echo 'ggl' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"ggl"]
+Return
+Return true
+Execute .target.bash_output "grep '^volume hh ' /etc/security/pam_mount.conf | sed -e 's/- //' | cut -f 4 -d ' '" $["stdout":"ggl"]
+Return
Execute .target.bash_output "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"]
Return
Dump ---- unchanged group 'ggl':
-Dump $["cn":"ggl", "gidnumber":"1000", "type":"local", "userlist":$["hh":"1"]]
-Dump ---- unchanged group 'ggs':
-Dump $["cn":"ggs", "gidnumber":"10", "type":"system"]
+Dump $["cn":"ggl", "gidnumber":"555", "modified":"added", "org_cn":"ggl", "org_gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$["hh":"1"], "what":"add_group"]
+Dump ---- unchanged group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"]
Return true
Dump ---- changed group 'ggl':
-Dump $["cn":"ggl", "gidnumber":"1000", "modified":"edited", "org_cn":"ggl", "org_gidnumber":"1000", "type":"local", "userlist":$[], "what":"user_change"]
-Dump ---- changed group 'ggs':
-Dump $["cn":"ggs", "gidnumber":"10", "modified":"edited", "org_cn":"ggs", "org_gidnumber":"10", "type":"system", "userlist":$["hh":"1"], "what":"user_change"]
+Dump $["cn":"ggl", "gidnumber":"555", "modified":"added", "org_cn":"ggl", "org_gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$[], "what":"user_change"]
+Dump ---- changed group 'audio':
+Dump $["cn":"audio", "gidnumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidnumber":"17", "type":"system", "userlist":$["hh":"1", "ii":"1"], "userpassword":"x", "what":"user_change"]
Copied: trunk/users/testsuite/tests/EditUsersGroups.ycp (from r40377, trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUsersGroups.ycp?p2=trunk/users/testsuite/tests/EditUsersGroups.ycp&p1=trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled&r1=40377&r2=40382&rev=40382&view=diff
==============================================================================
--- trunk/users/testsuite/tests/EditUsersGroups.ycp.disabled (original)
+++ trunk/users/testsuite/tests/EditUsersGroups.ycp Tue Aug 21 17:04:59 2007
@@ -9,98 +9,19 @@
{
// testedfiles: Users.pm
- import "Users";
+ import "Directory";
import "Mode";
- import "Testsuite";
+ import "Users";
+
+ string tmpdir = Directory::tmpdir;
+ foreach (string file, [ "passwd", "group", "shadow" ], {
+ string cmd = sformat ("/bin/cp ./%1 %2/", file, tmpdir);
+ SCR::Execute (.target.bash_output, cmd);
+ });
+ Users::SetBaseDirectory (tmpdir);
+ Users::ReadLocal ();
map READ = $[
- "passwd": $[
- "local": $[
- "users": $[
- "hh": $[
- "uid" : "hh",
- "uidnumber" : 500,
- "type" : "local",
- "userpassword" : "password",
- "gidnumber": 100,
- "grouplist" : $[
- "ggl" : 1
- ],
- ],
- "by_uidnumber": $[
- 500 : $[ "hh": 1],
- ],
- "last_uid": 500,
- "homes": $[
- ],
- "usernames": $[
- "hh": 1,
- ],
- "uids": $[
- 500: 1,
- ]
- ],
- "shadow": $[
- ],
- "groups": $[
- "users": $[
- "cn" : "users",
- "gidnumber": 100,
- "type" : "local",
- "more_users" : $[
- "hh": 1
- ],
- ],
- "ggl": $[
- "cn" : "ggl",
- "gidnumber": 1000,
- "type" : "local",
- "userlist": $[
- "hh": 1
- ]
- ],
- "by_gidnumber": $[
- 100 : $["users":1],
- 1000 : $["ggl":1],
- ],
- "gids": $[
- 100 : 1,
- 1000 : 1,
- ],
- "groupnames": $[
- "users" : 1,
- "ggl" : 1,
- ]
- ],
- ],
- "system": $[
- "users": $[
- "by_uidnumber" : $[],
- "last_uid" : 0,
- "homes" : $[],
- "usernames" : $[],
- "uids" : $[],
- ],
- "shadow": $[
- ],
- "groups": $[
- "ggs": $[
- "cn" : "ggs",
- "gidnumber" : 10,
- "type" : "system"
- ],
- "by_gidnumber": $[
- 10 : $["ggs":1],
- ],
- "gids": $[
- 10 : 1
- ],
- "groupnames": $[
- "ggs" : 1
- ]
- ],
- ],
- ],
"etc" : $[
"fstab": [],
"cryptotab": [],
@@ -135,14 +56,35 @@
],
"target" : $[
"bash" : 0,
- "bash_output" : $[],
+ "bash_output" : $[
+ "stdout": "",
+ ],
],
];
+ import "Testsuite";
+
Mode::SetTest ("test");
Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0);
+ map <string,any> group = $[
+ "gidnumber" : 555,
+ "cn" : "ggl",
+ "userlist" : $[ "hh" : 1 ],
+ "password" :"x",
+ "type" : "local",
+ "what" : "add_group"
+ ];
+
+ Testsuite::Test (``(Users::AddGroup (group)), [READ, WRITE, EXEC], 0);
+
+ EXEC ["target", "bash_output", "stdout"] = "ggl";
+
+ Testsuite::Test(``(Users::CheckGroup ($[])), [READ, WRITE, EXEC], 0);
+
+ Testsuite::Test(``(Users::CommitGroup ()), [READ, WRITE, EXEC], 0);
+
// for home directory checks
READ["target","stat","isdir"] = true;
@@ -150,7 +92,7 @@
map<string,any> changes = $[
"grouplist" : $[
- "ggs" : 1,
+ "audio" : 1,
]
];
@@ -162,11 +104,11 @@
Testsuite::Dump (sformat ("---- unchanged group 'ggl':\n %1", Users::GetGroupByName ("ggl", "")));
- Testsuite::Dump (sformat ("---- unchanged group 'ggs':\n %1", Users::GetGroupByName ("ggs", "")));
+ Testsuite::Dump (sformat ("---- unchanged group 'audio':\n %1", Users::GetGroupByName ("audio", "")));
Testsuite::Test (``(Users::CommitUser ()), [READ, WRITE, EXEC], 0);
Testsuite::Dump (sformat ("---- changed group 'ggl':\n %1", Users::GetGroupByName ("ggl", "")));
- Testsuite::Dump (sformat ("---- changed group 'ggs':\n %1", Users::GetGroupByName ("ggs", "")));
+ Testsuite::Dump (sformat ("---- changed group 'audio':\n %1", Users::GetGroupByName ("audio", "")));
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
| < Previous | Next > |