Merge pull request #7 from kobliha/master

Testsuites adapted to changes in Service module (bnc#807507)
yast · May 21, 2013 · b350f9b · b350f9b
2 parents 3318424 + 9e02669
commit b350f9b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 40 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.21.9
+2.24.0
diff --git a/package/yast2-runlevel.changes b/package/yast2-runlevel.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 20 16:23:13 CEST 2013 - locilka@suse.com
+
+- Testsuites adapted to changes in Service module (bnc#807507)
+- 2.24.0
+
 -------------------------------------------------------------------
 Wed Jan  9 16:04:23 UTC 2013 - locilka@suse.com
 

diff --git a/testsuite/tests/saveServices.out b/testsuite/tests/saveServices.out
@@ -5,33 +5,21 @@ Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/
 Return	true
 Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
 Log	Cannot enable service a (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "a" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "a" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable a.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled a.service" 0
 Log	Cannot enable service b (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "b" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "b" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable b.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled b.service" 0
 Return	true
 Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
 Log	Cannot enable service a (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "a" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "a" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable a.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled a.service" 0
 Log	Cannot enable service b (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "b" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "b" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable b.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled b.service" 0
 Return	true
 Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
 Log	Cannot enable service a (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "a" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "a" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable a.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled a.service" 0
 Log	Cannot enable service b (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "b" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "b" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable b.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled b.service" 0
 Return	true
 Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
 Execute	.target.bash_output "/bin/systemctl --force disable a.service" $["exit":0, "stderr":"", "stdout":""]
@@ -41,7 +29,5 @@ Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/
 Return	true
 Execute	.target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0
 Log	Cannot enable service nfsserver (just) in selected runlevels, enabling in all default ones
-Read	.init.scripts.runlevel "nfsserver" $["service":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]]
-Read	.init.scripts.comment "nfsserver" $["service":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]]
-Execute	.target.bash_output "/bin/systemctl enable nfsserver.service" $["exit":0, "stderr":"", "stdout":""]
+Execute	.target.bash "/bin/systemctl is-enabled nfsserver.service" 0
 Return	true
diff --git a/testsuite/tests/saveServices.ycp b/testsuite/tests/saveServices.ycp
@@ -14,27 +14,12 @@
 		"exists": true,
 		"default_runlevel" : "5",
 		"current_runlevel" : "5",
-		"runlevel" : $[
-		    "service" : $[
-			"start" : [ "0", "1", "3" ],
-			"stop" : [ "4", "5", "6" ],
-		    ],
-		],
-		"comment" : $[
-		    "service" : $[
-			"defstart" : [ "0", "1", "3" ],
-			"defstop" : [ "4", "5", "6" ],
-		    ],
-		],
 		],
 	    ],
-    	    "target" : $[
-        	"size" : -1,
-    	    ],
 	"target" : $[
 	    "stat" : $[	"isreg" : true ],
             "size" : 0,
-	]
+	    ]
 	];
     TESTSUITE_INIT ([READ, $[], $[]], nil);
 

diff --git a/yast2-runlevel.spec.in b/yast2-runlevel.spec.in
@@ -6,8 +6,8 @@ Group:	System/YaST
 License: GPL-2.0+
 BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
 
-# Service module switched to systemd
-BuildRequires:	yast2 >= 2.23.15
+# Don't use Info function to check enable state (bnc#807507)
+BuildRequires:	yast2 >= 2.23.23
 # Wizard::SetDesktopTitleAndIcon
 Requires:	yast2 >= 2.21.22