Author: kmachalkova Date: Mon Sep 8 12:58:08 2008 New Revision: 50787 URL: http://svn.opensuse.org/viewcvs/yast?rev=50787&view=rev Log: adjusted testsuite (read/write of idmapd.conf) Modified: trunk/nfs-client/testsuite/tests/readwrite.out trunk/nfs-client/testsuite/tests/readwrite.ycp trunk/nfs-client/testsuite/tests/readwrite2.out trunk/nfs-client/testsuite/tests/readwrite2.ycp Modified: trunk/nfs-client/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite.out?rev=50787&r1=50786&r2=50787&view=diff ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite.out (original) +++ trunk/nfs-client/testsuite/tests/readwrite.out Mon Sep 8 12:58:08 2008 @@ -1,6 +1,7 @@ Dump Read Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "yes" +Read .etc.idmapd_conf "Domain" "localhost" Read .init.scripts.exists "SuSEfirewall2_init" true Read .init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":[], "stop":[]], "networkmanager":$["start":["3", "5"], "stop":["3", "5"]], "nfs":$["start":["3", "5"], "stop":["3", "5"]], "nfsboot":$["start":[], "stop":[]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true @@ -30,6 +31,7 @@ Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfsboot" $["exit":0, "stderr":"", "stdout":""] Write .sysconfig.nfs.NFS4_SUPPORT "yes" true +Write .etc.idmapd_conf ["Domain", "localhost"] true Read .init.scripts.exists "nfs" true Execute .target.bash "/etc/init.d/nfs stop" $["TERM":"raw"] 0 Read .init.scripts.exists "portmap" true Modified: trunk/nfs-client/testsuite/tests/readwrite.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite.ycp?rev=50787&r1=50786&r2=50787&view=diff ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite.ycp (original) +++ trunk/nfs-client/testsuite/tests/readwrite.ycp Mon Sep 8 12:58:08 2008 @@ -113,7 +113,8 @@ "vfstype":"nfs", ], ], - ], + "idmapd_conf" : "localhost" + ], "sysconfig": $[ "nfs" : $[ "NFS4_SUPPORT": "yes", Modified: trunk/nfs-client/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite2.out?rev=50787&r1=50786&r2=50787&view=diff ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-client/testsuite/tests/readwrite2.out Mon Sep 8 12:58:08 2008 @@ -3,6 +3,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .etc.idmapd_conf "Domain" "localhost" Read .init.scripts.exists "SuSEfirewall2_init" true Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true @@ -50,6 +51,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .etc.idmapd_conf "Domain" "localhost" Return true Dump Dump Write - nfs is in use - so, sart services @@ -95,6 +97,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .etc.idmapd_conf "Domain" "localhost" Return true Dump Dump Write - nfs not used - so, stopping services @@ -113,6 +116,7 @@ Dump Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] Read .sysconfig.nfs.NFS4_SUPPORT "no" +Read .etc.idmapd_conf "Domain" "localhost" Return true Dump Dump Write - nfs not used; leave services stopped Modified: trunk/nfs-client/testsuite/tests/readwrite2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite2.ycp?rev=50787&r1=50786&r2=50787&view=diff ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite2.ycp (original) +++ trunk/nfs-client/testsuite/tests/readwrite2.ycp Mon Sep 8 12:58:08 2008 @@ -109,7 +109,8 @@ "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs", ], - ], + ], + "idmapd_conf" : "localhost" ], "sysconfig": $[ "nfs" : $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org