From 0bd5fd797e53a3170732c6c616f47774d3d267d5 Mon Sep 17 00:00:00 2001 From: Alexandre Bezroutchko Date: Mon, 8 Oct 2012 00:55:38 +0200 Subject: [PATCH] dvp/qvm-usb: fixed test scripts, they are somewhat useable again --- test/pvusb-001-mouse-kbd-attached | 9 ++++----- .../pvusb-002-mouse-kbd-usbstick-wlan-attached | 18 ++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/test/pvusb-001-mouse-kbd-attached b/test/pvusb-001-mouse-kbd-attached index dd9b27f..ec51861 100755 --- a/test/pvusb-001-mouse-kbd-attached +++ b/test/pvusb-001-mouse-kbd-attached @@ -5,11 +5,10 @@ tmpf=`mktemp` sudo xenstore-ls -f qubes-usb-devices | sort > $tmpf cat << 'END' | diff -u - $tmpf -qubes-usb-devices/002 = "" -qubes-usb-devices/002/002 = "" -qubes-usb-devices/002/002/desc = "046a:0021 046a_0021" -qubes-usb-devices/002/003 = "" -qubes-usb-devices/002/003/desc = "045e:0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0" +qubes-usb-devices/2-1 = "" +qubes-usb-devices/2-1/desc = "046a:0021 046a_0021" +qubes-usb-devices/2-2 = "" +qubes-usb-devices/2-2/desc = "045e:0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0" END rm $tmpf diff --git a/test/pvusb-002-mouse-kbd-usbstick-wlan-attached b/test/pvusb-002-mouse-kbd-usbstick-wlan-attached index 5c2c3b3..6705329 100755 --- a/test/pvusb-002-mouse-kbd-usbstick-wlan-attached +++ b/test/pvusb-002-mouse-kbd-usbstick-wlan-attached @@ -5,16 +5,14 @@ tmpf=`mktemp` sudo xenstore-ls -f qubes-usb-devices | sort > $tmpf cat << 'END' | diff -u - $tmpf -qubes-usb-devices/002 = "" -qubes-usb-devices/002/002 = "" -qubes-usb-devices/002/002/desc = "046a:0021 046a_0021" -qubes-usb-devices/002/003 = "" -qubes-usb-devices/002/003/desc = "045e:0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0" -qubes-usb-devices/007 = "" -qubes-usb-devices/007/010 = "" -qubes-usb-devices/007/010/desc = "0781:5530 SanDisk_Cruzer_1942531DB09038A6" -qubes-usb-devices/007/013 = "" -qubes-usb-devices/007/013/desc = "07d1:3c0a Ralink_11n_Adapter_1.0" +qubes-usb-devices/2-1 = "" +qubes-usb-devices/2-1/desc = "046a:0021 046a_0021" +qubes-usb-devices/2-2 = "" +qubes-usb-devices/2-2/desc = "045e:0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0" +qubes-usb-devices/7-1 = "" +qubes-usb-devices/7-1/desc = "07d1:3c0a Ralink_11n_Adapter_1.0" +qubes-usb-devices/7-5 = "" +qubes-usb-devices/7-5/desc = "0781:5530 SanDisk_Cruzer_1942531DB09038A6" END rm $tmpf