[yast-commit] r65583 - in /trunk/dhcp-server: package/ testsuite/tests/

6 Sep 2011

Author: locilka
Date: Tue Sep  6 16:49:57 2011
New Revision: 65583

URL: http://svn.opensuse.org/viewcvs/yast?rev=65583&view=rev
Log:
- Adapted testsuite


Modified:
    trunk/dhcp-server/package/yast2-dhcp-server.changes
    trunk/dhcp-server/testsuite/tests/Read.out
    trunk/dhcp-server/testsuite/tests/YaPIAddDeclaration.out
    trunk/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out
    trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationChildren.out
    trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationDirectives.out
    trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationOptions.out
    trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationParent.out
    trunk/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out
    trunk/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out
    trunk/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out

Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-server.changes?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================

--- trunk/dhcp-server/package/yast2-dhcp-server.changes (original)
+++ trunk/dhcp-server/package/yast2-dhcp-server.changes Tue Sep  6 16:49:57 2011
@@ -2,6 +2,7 @@
 Tue Sep  6 16:35:43 CEST 2011 - locilka@suse.cz
 
 - Fixed detection of default exemplary config file (bnc #715473)
+- Adapted testsuite
 - 2.21.0
 
 -------------------------------------------------------------------

Modified: trunk/dhcp-server/testsuite/tests/Read.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/Read.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/Read.out (original)
+++ trunk/dhcp-server/testsuite/tests/Read.out Tue Sep  6 16:49:57 2011
@@ -5,7 +5,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	true
 Return	$["allowed_interfaces":["eth0", "eth2"], "chroot":"0", "other_options":"-p 111", "settings":[$["children":[], "comment_after":nil, "comment_before":nil, "directives":[], "id":"", "options":[$["comment_after":"", "comment_before":"# dhcpd.conf", "key":"domain-name", "type":"option", "value":"\"example.org\""], $["comment_after":"", "comment_before":"", "key":"domain-name-servers", "type":"option", "value":"ns1.example.org, ns2.example.org"], $["comment_after":"", "comment_before":"", "key":"policy-filter", "type":"option", "value":"{ a1, a2 }, { a1, a2 }, { a3, a4 }"]], "parent_id":"", "parent_type":"", "type":""]], "start_service":"0", "use_ldap":"0"]

Modified: trunk/dhcp-server/testsuite/tests/YaPIAddDeclaration.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPIAddDeclaration.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPIAddDeclaration.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPIAddDeclaration.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Write	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]], $["comment_after":"", "comment_before":"", "key":"192.168.5.1 netmask 255.255.255.0", "type":"subnet", "value":[]]] true
 Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true

Modified: trunk/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPIDeleteDeclartion.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Write	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true
 Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
@@ -23,7 +23,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Write	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"]] true
 Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true

Modified: trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationChildren.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationChildren.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationChildren.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationChildren.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[$["id":"192.168.0.0 netmask 255.255.255.0", "type":"subnet"]]
 Dump	==========================================================
@@ -17,7 +17,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[$["id":"h1", "type":"host"], $["id":"h2", "type":"host"]]
 Dump	==========================================================
@@ -28,7 +28,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[]
 Dump	==========================================================

Modified: trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationDirectives.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationDirectives.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationDirectives.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationDirectives.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"]]
 Dump	==========================================================
@@ -17,7 +17,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[$["key":"ddns-update-style", "type":"directive", "value":"none"]]
 Dump	==========================================================

Modified: trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationOptions.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationOptions.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationOptions.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationOptions.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[]
 Dump	==========================================================
@@ -17,7 +17,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	[$["key":"domain-name", "type":"option", "value":"\"example.net\""]]
 Dump	==========================================================

Modified: trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationParent.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationParent.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationParent.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPIGetDeclarationParent.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	$["id":"", "type":""]
 Dump	==========================================================
@@ -17,7 +17,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Return	$["id":"192.168.0.0 netmask 255.255.255.0", "type":"subnet"]
 Dump	==========================================================

Modified: trunk/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPISetDeclarationDirectives.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Write	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"max-lease-time", "type":"directive", "value":"123456"], $["key":"range", "type":"directive", "value":"192.168.0.110 192.168.0.220"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true
 Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true

Modified: trunk/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPISetDeclarationOptions.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Write	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"domain-name", "type":"directive", "value":"\"example.net\""], $["key":"wins-server", "type":"directive", "value":"wins.example.net"], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]] true
 Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true

Modified: trunk/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out?rev=65583&r1=65582&r2=65583&view=diff
==============================================================================
--- trunk/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out (original)
+++ trunk/dhcp-server/testsuite/tests/YaPISetDeclarationParent.out Tue Sep  6 16:49:57 2011
@@ -6,7 +6,7 @@
 Read	.sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111"
 Read	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]], $["key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]]]
 Read	.target.size "/etc/dhcpd.conf" 5
-Execute	.target.bash "diff -q /etc/dhcpd.conf \\\n             /usr/share/doc/packages/dhcp-server/dhcpd.conf" 1
+Execute	.target.bash "rpm -q -V --file /etc/dhcpd.conf --nouser --nogroup --nomtime --nomode" 1
 Read	.target.stat "/var/lib/YaST2/dhcp_server_done_once" $[]
 Write	.etc.dhcpd_conf [$["key":"domain-name", "type":"option", "value":"\"example.net\""], $["key":"ddns-update-style", "type":"directive", "value":"none"], $["comment_after":nil, "comment_before":nil, "key":"192.168.0.0 netmask 255.255.255.0", "type":"subnet", "value":[$["key":"range", "type":"directive", "value":"192.168.0.100 192.168.0.200"], $["comment_after":nil, "comment_before":nil, "key":"h2", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.2"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:77"]]]]], $["comment_after":nil, "comment_before":nil, "key":"h1", "type":"host", "value":[$["key":"fixed-address", "type":"directive", "value":"192.168.0.1"], $["key":"hardware", "type":"directive", "value":"ethernet 11:22:33:44:55:66"]]]] true
 Write	.sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r65583 - in /trunk/dhcp-server: package/ testsuite/tests/

locilka＠svn2.opensuse.org