Author: mzugec Date: Mon Sep 3 17:30:44 2007 New Revision: 40737 URL: http://svn.opensuse.org/viewcvs/yast?rev=40737&view=rev Log: changed testsuite output Modified: trunk/printer/package/yast2-printer.changes trunk/printer/testsuite/tests/detectPrinters.out trunk/printer/testsuite/tests/detectPrinters.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=40737&r1=40736&r2=40737&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Sep 3 17:30:44 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 3 17:31:11 CEST 2007 - mzugec@suse.cz + +- changed testsuite output + +------------------------------------------------------------------- Mon Sep 3 16:47:22 CEST 2007 - mzugec@suse.cz - read URI for usb printers from cups backend if not available Modified: trunk/printer/testsuite/tests/detectPrinters.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPrinters.out?rev=40737&r1=40736&r2=40737&view=diff ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.out (original) +++ trunk/printer/testsuite/tests/detectPrinters.out Mon Sep 3 17:30:44 2007 @@ -1,47 +1,51 @@ Dump --- Detection for lprng Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Canon", "vendor_db":""]] +Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Canon", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Canon", "vendor_db":""]] +Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Canon", "vendor_db":""]] Dump --- Detection for lprng Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] +Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] +Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc."]] @@ -50,17 +54,19 @@ Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Log i $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"Stylus Photo 810", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc."] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "Stylus Photo 810"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"Stylus Photo 810", "device_db":"", "info":"Epson Stylus Photo 810", "location":"USB printer on //EPSON/Stylus%20Photo%20810?serial=W33040110201335050", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb://EPSON/Stylus%20Photo%20810?serial=W33040110201335050", "vendor":"Epson", "vendor_db":""]] +Return [$["device":"Stylus Photo 810", "device_db":"", "info":"Epson Stylus Photo 810", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"]] +Read .probe.printer [$["bus":"USB", "class_id":265, "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"]] Read .target.size "/usr/lib/cups/backend/usb" 555 Execute .target.bash_output "/usr/lib/cups/backend/usb" $["exit":0, "stderr":"", "stdout":"direct ptal:/mlc:usb:PSC_2200_Series \"Hewlett-Packard PSC 2200 Series\" \"PTAL mlc:usb:PSC_2200_Series\"\n"] Execute .target.bash "grep '^usblp ' /proc/modules" 0 +Log i $["bus":"USB", "class_id":265, "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"] Read .ppd.db.vendorname "HP" "" Read .ppd.db.modelname ["HP", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"USB Printer", "device_db":"", "info":"HP USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"HP", "vendor_db":""]] +Return [$["device":"USB Printer", "device_db":"", "info":"HP USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"HP", "vendor_db":""]] Modified: trunk/printer/testsuite/tests/detectPrinters.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPrinters.ycp?rev=40737&r1=40736&r2=40737&view=diff ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.ycp (original) +++ trunk/printer/testsuite/tests/detectPrinters.ycp Mon Sep 3 17:30:44 2007 @@ -104,7 +104,7 @@ $[ "bus":"USB", "class_id":265, - "dev_name":"/dev/usblp0", +// "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", @@ -150,7 +150,7 @@ $[ "bus":"USB", "class_id":265, - "dev_name":"/dev/usblp0", +// "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", @@ -228,7 +228,7 @@ $[ "bus":"USB", "class_id":265, - "dev_name":"/dev/usblp0", +// "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org