Author: locilka Date: Mon Sep 8 10:39:11 2008 New Revision: 50781 URL: http://svn.opensuse.org/viewcvs/yast?rev=50781&view=rev Log: Adjusted testsuite Modified: trunk/packager/testsuite/tests/insturl-cd.out trunk/packager/testsuite/tests/insturl-ftp.out trunk/packager/testsuite/tests/insturl-http.out trunk/packager/testsuite/tests/insturl-iso.out trunk/packager/testsuite/tests/insturl-ops.out trunk/packager/testsuite/tests/insturl-smb.out Modified: trunk/packager/testsuite/tests/insturl-cd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/insturl-cd.out?rev=50781&r1=50780&r2=50781&view=diff ============================================================================== --- trunk/packager/testsuite/tests/insturl-cd.out (original) +++ trunk/packager/testsuite/tests/insturl-cd.out Mon Sep 8 10:39:11 2008 @@ -2,10 +2,12 @@ Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode"] Read .etc.install_inf."InstMode" "cd" +Log Initial repository not found in install.inf Read .probe.cdrom [$["dev_name":"/dev/hda"]] Return cd:///?devices=/dev/hda Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode"] Read .etc.install_inf."InstMode" nil +Log Initial repository not found in install.inf Read .probe.cdrom [$["dev_name":"/dev/hda"]] Return cd:///?devices=/dev/hda Modified: trunk/packager/testsuite/tests/insturl-ftp.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/insturl-ftp.out?rev=50781&r1=50780&r2=50781&view=diff ============================================================================== --- trunk/packager/testsuite/tests/insturl-ftp.out (original) +++ trunk/packager/testsuite/tests/insturl-ftp.out Mon Sep 8 10:39:11 2008 @@ -4,14 +4,18 @@ Read .etc.install_inf."InstMode" "ftp" Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "pub" +Log Initial repository not found in install.inf Return ftp://192.168.1.1/pub +Log Initial repository not found in install.inf Return ftp://192.168.1.1/pub/test +Log Initial repository not found in install.inf Return ftp://192.168.1.1/pub/test Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Server", "Serverdir"] Read .etc.install_inf."InstMode" "ftp" Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "/pub" +Log Initial repository not found in install.inf Return ftp://192.168.1.1/%2fpub Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Password", "Server", "Serverdir", "Username"] @@ -20,4 +24,5 @@ Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "pub" Read .etc.install_inf."Username" "suse" +Log Initial repository not found in install.inf Return ftp://suse:yast2@192.168.1.1/pub Modified: trunk/packager/testsuite/tests/insturl-http.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/insturl-http.out?rev=50781&r1=50780&r2=50781&view=diff ============================================================================== --- trunk/packager/testsuite/tests/insturl-http.out (original) +++ trunk/packager/testsuite/tests/insturl-http.out Mon Sep 8 10:39:11 2008 @@ -4,8 +4,11 @@ Read .etc.install_inf."InstMode" "http" Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "/install" +Log Initial repository not found in install.inf Return http://192.168.1.1/install +Log Initial repository not found in install.inf Return http://192.168.1.1/install/test +Log Initial repository not found in install.inf Return http://192.168.1.1/install/test Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Password", "Port", "Server", "Serverdir", "Username"] @@ -15,6 +18,7 @@ Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "pub" Read .etc.install_inf."Username" "suse" +Log Initial repository not found in install.inf Return http://suse:yast2@192.168.1.1:8888/pub Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Password", "Port", "Proxy", "ProxyPassword", "ProxyPort", "ProxyUser", "Server", "Serverdir", "Username"] @@ -28,4 +32,5 @@ Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "pub" Read .etc.install_inf."Username" "suse" +Log Initial repository not found in install.inf Return http://suse:yast2@192.168.1.1:8888/pub?proxy=http://proxy.suse.de&proxyport=8888&proxyuser=foo&proxypassword=bar Modified: trunk/packager/testsuite/tests/insturl-iso.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/insturl-iso.out?rev=50781&r1=50780&r2=50781&view=diff ============================================================================== --- trunk/packager/testsuite/tests/insturl-iso.out (original) +++ trunk/packager/testsuite/tests/insturl-iso.out Mon Sep 8 10:39:11 2008 @@ -5,6 +5,9 @@ Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "/install/images/CD1.iso" Read .etc.install_inf."SourceType" "file" +Log Initial repository not found in install.inf Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/ +Log Initial repository not found in install.inf Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test +Log Initial repository not found in install.inf Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test Modified: trunk/packager/testsuite/tests/insturl-ops.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/insturl-ops.out?rev=50781&r1=50780&r2=50781&view=diff ============================================================================== --- trunk/packager/testsuite/tests/insturl-ops.out (original) +++ trunk/packager/testsuite/tests/insturl-ops.out Mon Sep 8 10:39:11 2008 @@ -2,6 +2,7 @@ Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode"] Read .etc.install_inf."InstMode" "cd" +Log Initial repository not found in install.inf Read .probe.cdrom [$["dev_name":"/dev/hda"]] Return cd:///?devices=/dev/hda Read .probe.cdrom [$["dev_name":"/dev/hdb"], $["dev_name":"/dev/hdd"]] Modified: trunk/packager/testsuite/tests/insturl-smb.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/insturl-smb.out?rev=50781&r1=50780&r2=50781&view=diff ============================================================================== --- trunk/packager/testsuite/tests/insturl-smb.out (original) +++ trunk/packager/testsuite/tests/insturl-smb.out Mon Sep 8 10:39:11 2008 @@ -5,8 +5,11 @@ Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "pub" Read .etc.install_inf."Share" "SHARE" +Log Initial repository not found in install.inf Return smb://192.168.1.1/SHARE/pub +Log Initial repository not found in install.inf Return smb://192.168.1.1/SHARE/pub/test +Log Initial repository not found in install.inf Return smb://192.168.1.1/SHARE/pub/test Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Server", "Serverdir", "Share"] @@ -14,6 +17,7 @@ Read .etc.install_inf."Server" "192.168.1.1" Read .etc.install_inf."Serverdir" "/pub" Read .etc.install_inf."Share" "SHARE" +Log Initial repository not found in install.inf Return smb://192.168.1.1/SHARE//pub Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Password", "Server", "Serverdir", "Share", "Username"] @@ -23,6 +27,7 @@ Read .etc.install_inf."Serverdir" "pub" Read .etc.install_inf."Share" "SHARE" Read .etc.install_inf."Username" "suse" +Log Initial repository not found in install.inf Return smb://suse:yast2@192.168.1.1/SHARE/pub Read .target.size "/etc/install.inf" 1 Dir .etc.install_inf: ["InstMode", "Password", "Server", "Serverdir", "Share", "Username", "WorkDomain"] @@ -33,4 +38,5 @@ Read .etc.install_inf."Share" "SHARE" Read .etc.install_inf."Username" "suse" Read .etc.install_inf."WorkDomain" "group" +Log Initial repository not found in install.inf Return smb://suse:yast2@192.168.1.1/SHARE/pub?workgroup=group -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org