Mailinglist Archive: yast-commit (701 mails)
| < Previous | Next > |
[yast-commit] r65578 - in /branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests: ServiceStatus.out ServiceStatus.ycp
- From: lslezak@xxxxxxxxxxxxxxxxx
- Date: Tue, 06 Sep 2011 14:22:18 -0000
- Message-id: <20110906142218.3B10E32320@svn2.opensuse.org>
Author: lslezak
Date: Tue Sep 6 16:22:17 2011
New Revision: 65578
URL: http://svn.opensuse.org/viewcvs/yast?rev=65578&view=rev
Log:
adapted Service::Status test
Modified:
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
Modified:
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out?rev=65578&r1=65577&r2=65578&view=diff
==============================================================================
---
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
(original)
+++
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
Tue Sep 6 16:22:17 2011
@@ -1,3 +1,4 @@
-Read .init.scripts.exists "aaa" true
-Execute .target.bash "/etc/init.d/aaa status" $["TERM":"raw"] 3
+Read .target.tmpdir "/tmp"
+Read .target.stat "/etc/init.d/aaa" $["isreg":true]
+Execute .target.bash "/sbin/service aaa status" $["TERM":"raw"] 3
Return 3
Modified:
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp?rev=65578&r1=65577&r2=65578&view=diff
==============================================================================
---
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
(original)
+++
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
Tue Sep 6 16:22:17 2011
@@ -1,13 +1,13 @@
{
include "testsuite.ycp";
- import "Service";
- map READ = $[];
- map EXEC = $[];
+ TESTSUITE_INIT ([$[ "target" : $[ "tmpdir": "/tmp" ] ], $[], $[]], nil);
+
+ import "Service";
- READ = $[ "init" : $[ "scripts" : $[ "exists" : true, ] ] ];
- EXEC = $[ "target" : $[ "bash" : 3 ] ];
+ map READ = $[ "target" : $[ "stat" : $["isreg": true] ] ];
+ map EXEC = $[ "target" : $[ "bash" : 3 ] ];
TEST (``(Service::Status ("aaa")), [ READ, $[], EXEC ], nil);
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
Date: Tue Sep 6 16:22:17 2011
New Revision: 65578
URL: http://svn.opensuse.org/viewcvs/yast?rev=65578&view=rev
Log:
adapted Service::Status test
Modified:
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
Modified:
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out?rev=65578&r1=65577&r2=65578&view=diff
==============================================================================
---
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
(original)
+++
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.out
Tue Sep 6 16:22:17 2011
@@ -1,3 +1,4 @@
-Read .init.scripts.exists "aaa" true
-Execute .target.bash "/etc/init.d/aaa status" $["TERM":"raw"] 3
+Read .target.tmpdir "/tmp"
+Read .target.stat "/etc/init.d/aaa" $["isreg":true]
+Execute .target.bash "/sbin/service aaa status" $["TERM":"raw"] 3
Return 3
Modified:
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp?rev=65578&r1=65577&r2=65578&view=diff
==============================================================================
---
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
(original)
+++
branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceStatus.ycp
Tue Sep 6 16:22:17 2011
@@ -1,13 +1,13 @@
{
include "testsuite.ycp";
- import "Service";
- map READ = $[];
- map EXEC = $[];
+ TESTSUITE_INIT ([$[ "target" : $[ "tmpdir": "/tmp" ] ], $[], $[]], nil);
+
+ import "Service";
- READ = $[ "init" : $[ "scripts" : $[ "exists" : true, ] ] ];
- EXEC = $[ "target" : $[ "bash" : 3 ] ];
+ map READ = $[ "target" : $[ "stat" : $["isreg": true] ] ];
+ map EXEC = $[ "target" : $[ "bash" : 3 ] ];
TEST (``(Service::Status ("aaa")), [ READ, $[], EXEC ], nil);
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
| < Previous | Next > |