Testsuites adapted to switching Service module to systemd

VERSION

@@ -1 +1 @@
-2.21.8
+2.21.9

package/yast2-nfs-client.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan  3 14:28:16 UTC 2013 - locilka@suse.com
+
+- Testsuites adapted to switching Service module to systemd
+  (yast2-2.23.15)
+- 2.21.9
+
 -------------------------------------------------------------------
 Thu Sep 20 12:57:40 UTC 2012 - mfilka@suse.com
 

testsuite/tests/readwrite.out

@@ -3,8 +3,8 @@ Read	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec"
 Read	.sysconfig.nfs.NFS4_SUPPORT "yes"
 Read	.sysconfig.nfs.NFS_SECURITY_GSS "yes"
 Read	.etc.idmapd_conf "Domain" "localhost"
-Execute	.target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0
-Execute	.target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0
+Execute	.target.bash "/bin/systemctl is-enabled SuSEfirewall2_init.service" 0
+Execute	.target.bash "/bin/systemctl is-enabled SuSEfirewall2_setup.service" 0
 Return	true
 Dump	Write OK
 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"]]
@@ -19,14 +19,14 @@ Read	.init.scripts.runlevel "nfs" $["network":$["start":[], "stop":[]], "network
 Read	.init.scripts.comment "nfs" $["nfs":$[], "portmap":$[]]
 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/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl enable nfsboot.service" $["exit":0, "stderr":"", "stdout":""]
 Write	.sysconfig.nfs.NFS4_SUPPORT "yes" true
 Write	.etc.idmapd_conf ["Domain", "localhost"] true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "yes" true
-Execute	.target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash "/sbin/service portmap status" $["TERM":"raw"] 0
-Execute	.target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash "/sbin/service nfs status" $["TERM":"raw"] 0
+Execute	.target.bash_output "/bin/systemctl stop nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl status portmap.service" $["TERM":"raw"] 0
+Execute	.target.bash_output "/bin/systemctl start nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl status nfs.service" $["TERM":"raw"] 0
 Return	true
 Dump	Write KO
 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"]]

testsuite/tests/readwrite2.out

@@ -5,8 +5,8 @@ Read	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec"
 Read	.sysconfig.nfs.NFS4_SUPPORT "no"
 Read	.sysconfig.nfs.NFS_SECURITY_GSS "no"
 Read	.etc.idmapd_conf "Domain" "localhost"
-Execute	.target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0
-Execute	.target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0
+Execute	.target.bash "/bin/systemctl is-enabled SuSEfirewall2_init.service" 0
+Execute	.target.bash "/bin/systemctl is-enabled SuSEfirewall2_setup.service" 0
 Return	true
 Dump	
 Dump	Write - nfs is in use - start services
@@ -23,13 +23,13 @@ Read	.init.scripts.runlevel "nfs" $["nfs":$["start":["3", "5"], "stop":["3", "5"
 Read	.init.scripts.comment "nfs" $["nfs":$[], "portmap":$[]]
 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/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl enable nfsboot.service" $["exit":0, "stderr":"", "stdout":""]
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
-Execute	.target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash "/sbin/service portmap status" $["TERM":"raw"] 0
-Execute	.target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash "/sbin/service nfs status" $["TERM":"raw"] 0
+Execute	.target.bash_output "/bin/systemctl stop nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl status portmap.service" $["TERM":"raw"] 0
+Execute	.target.bash_output "/bin/systemctl start nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl status nfs.service" $["TERM":"raw"] 0
 Return	true
 Dump	
 Dump	Read  - nfs is in use & stopped
@@ -50,19 +50,19 @@ Execute	.target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save",
 Write	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "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":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] true
 Read	.init.scripts.runlevel "portmap" $["nfs":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
 Read	.init.scripts.comment "portmap" $["nfs":$[], "portmap":$[]]
-Execute	.target.bash_output "/sbin/chkconfig -a portmap" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl enable portmap.service" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.runlevel "nfs" $["nfs":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
 Read	.init.scripts.comment "nfs" $["nfs":$[], "portmap":$[]]
-Execute	.target.bash_output "/sbin/chkconfig -a nfs" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl enable nfs.service" $["exit":0, "stderr":"", "stdout":""]
 Read	.init.scripts.runlevel "nfsboot" $["nfs":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]]
 Read	.init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]]
-Execute	.target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl enable nfsboot.service" $["exit":0, "stderr":"", "stdout":""]
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
-Execute	.target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash "/sbin/service portmap status" $["TERM":"raw"] 0
-Execute	.target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
-Execute	.target.bash "/sbin/service nfs status" $["TERM":"raw"] 0
+Execute	.target.bash_output "/bin/systemctl stop nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl status portmap.service" $["TERM":"raw"] 0
+Execute	.target.bash_output "/bin/systemctl start nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl status nfs.service" $["TERM":"raw"] 0
 Return	true
 Dump	
 Dump	Read  - nfs not used & running
@@ -80,7 +80,7 @@ Execute	.target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save",
 Write	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
-Execute	.target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl stop nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
 Return	true
 Dump	
 Dump	Read  - nfs not used & services are stopped
@@ -98,5 +98,5 @@ Execute	.target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save",
 Write	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
-Execute	.target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash_output "/bin/systemctl stop nfs.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
 Return	true

yast2-nfs-client.spec.in

@@ -4,7 +4,8 @@
 Group:          System/YaST
 License:        GPL-2.0+
 BuildRequires:  perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite 
-BuildRequires:  yast2 >= 2.23.6
+# Service module switched to systemd in yast2-2.23.15
+BuildRequires:  yast2 >= 2.23.15
 # yast2-nfs-client depends on nfs-utils in term that edits nfs-utils' options.
 # Support was checked against nfs-utils 1.2.7.
 # As soon as nfs-utils reaches version 1.2.9 there should be another update.