Author: kmachalkova
Date: Tue Apr 15 10:45:19 2008
New Revision: 46643
URL: http://svn.opensuse.org/viewcvs/yast?rev=46643&view=rev
Log:
Adjusted testsuites (reading new sysconfig variable)
removed debug logging
Modified:
trunk/nfs-client/src/Nfs.ycp
trunk/nfs-client/src/ui.ycp
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/src/Nfs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=46643&r1=46642&r2=46643&view=diff
==============================================================================
--- trunk/nfs-client/src/Nfs.ycp (original)
+++ trunk/nfs-client/src/Nfs.ycp Tue Apr 15 10:45:19 2008
@@ -260,8 +260,9 @@
return ( entry["vfstype"]:"" != "nfs" && entry["vfstype"]:"" != "nfs4");
});
fstab = UnescapeSpaces (fstab);
+
foreach (map entry, nfs_entries, ``{
- fstab = add (fstab, (map)union (entry, $["vfstype": "nfs", "freq": 0, "passno": 0]));
+ fstab = add (fstab, (map)union (entry, $[/*"vfstype": "nfs",*/ "freq": 0, "passno": 0]));
// create mount points
string file = entry["file"]:"";
Modified: trunk/nfs-client/src/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=46643&r1=46642&r2=46643&view=diff
==============================================================================
--- trunk/nfs-client/src/ui.ycp (original)
+++ trunk/nfs-client/src/ui.ycp Tue Apr 15 10:45:19 2008
@@ -552,7 +552,6 @@
}
else if (ret == `enable_nfs4)
{
- y2internal("!!!yebat");
boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4), `Value);
UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled);
}
Modified: trunk/nfs-client/testsuite/tests/readwrite.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite.out?rev=46643&r1=46642&r2=46643&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite.out (original)
+++ trunk/nfs-client/testsuite/tests/readwrite.out Tue Apr 15 10:45:19 2008
@@ -1,5 +1,6 @@
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 .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
@@ -28,6 +29,7 @@
Read .init.scripts.runlevel "nfsboot" $["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.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
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=46643&r1=46642&r2=46643&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite.ycp (original)
+++ trunk/nfs-client/testsuite/tests/readwrite.ycp Tue Apr 15 10:45:19 2008
@@ -113,12 +113,12 @@
"vfstype":"nfs",
],
],
- "sysconfig": $[
- "nfs" : $[
- "NFS4_SUPPORT": "yes",
- ],
- ]
- ]
+ ],
+ "sysconfig": $[
+ "nfs" : $[
+ "NFS4_SUPPORT": "yes",
+ ],
+ ],
];
map WRITE = $[
Modified: trunk/nfs-client/testsuite/tests/readwrite2.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite2.out?rev=46643&r1=46642&r2=46643&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite2.out (original)
+++ trunk/nfs-client/testsuite/tests/readwrite2.out Tue Apr 15 10:45:19 2008
@@ -2,6 +2,7 @@
Dump Read - nfs is in use & running
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 .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
@@ -32,6 +33,7 @@
Read .init.scripts.runlevel "nfsboot" $["nfs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]]
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 "no" true
Read .init.scripts.exists "nfs" true
Execute .target.bash "/etc/init.d/nfs stop" $["TERM":"raw"] 0
Read .init.scripts.exists "portmap" true
@@ -47,6 +49,7 @@
Dump Read - nfs is in use & stopped
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"
Return true
Dump
Dump Write - nfs is in use - so, sart services
@@ -75,6 +78,7 @@
Read .init.scripts.runlevel "nfsboot" $["nfs":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
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 "no" true
Read .init.scripts.exists "nfs" true
Execute .target.bash "/etc/init.d/nfs stop" $["TERM":"raw"] 0
Read .init.scripts.exists "portmap" true
@@ -90,6 +94,7 @@
Dump Read - nfs not used & running
Dump
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]]
+Read .sysconfig.nfs.NFS4_SUPPORT "no"
Return true
Dump
Dump Write - nfs not used - so, stopping services
@@ -97,6 +102,7 @@
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]]
Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0
Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true
+Write .sysconfig.nfs.NFS4_SUPPORT "no" true
Read .init.scripts.exists "nfs" true
Execute .target.bash "/etc/init.d/nfs stop" $["TERM":"raw"] 0
Read .init.scripts.exists "SuSEfirewall2_init" true
@@ -106,6 +112,7 @@
Dump Read - nfs not used & services are stopped
Dump
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]]
+Read .sysconfig.nfs.NFS4_SUPPORT "no"
Return true
Dump
Dump Write - nfs not used; leave services stopped
@@ -113,6 +120,7 @@
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]]
Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0
Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true
+Write .sysconfig.nfs.NFS4_SUPPORT "no" true
Read .init.scripts.exists "nfs" true
Execute .target.bash "/etc/init.d/nfs stop" $["TERM":"raw"] 0
Read .init.scripts.exists "SuSEfirewall2_init" true
Modified: trunk/nfs-client/testsuite/tests/readwrite2.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite2.ycp?rev=46643&r1=46642&r2=46643&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite2.ycp (original)
+++ trunk/nfs-client/testsuite/tests/readwrite2.ycp Tue Apr 15 10:45:19 2008
@@ -111,6 +111,11 @@
],
],
],
+ "sysconfig": $[
+ "nfs" : $[
+ "NFS4_SUPPORT": "no",
+ ],
+ ],
];
// services portmap & nfs are stopped.
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
