From 0283750b9df72091b7a98757db872590b2948595 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 14 Jun 2013 14:58:52 -0400
Subject: [PATCH] Fix USB test failures with latest libvirt

---
 tests/clitest.py                              | 2 +-
 tests/utils.py                                | 8 ++++----
 tests/xmlparse-xml/change-controllers-in.xml  | 2 +-
 tests/xmlparse-xml/change-controllers-out.xml | 3 +--
 tests/xmlparse-xml/change-redirdev-in.xml     | 1 -
 tests/xmlparse-xml/change-redirdev-out.xml    | 1 -
 tests/xmlparse.py                             | 6 +++---
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/clitest.py b/tests/clitest.py
index 4ebee41b8..806c5d7bd 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -520,7 +520,7 @@ vinst.add_invalid("char", "--console pty,target_type=abcd")  # --console unknown
 vinst.add_category("controller", "--noautoconsole --nodisks --pxe")
 vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7")
 vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7,index=0")
-vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7,index=1,master=0")
+vinst.add_valid("controller", "--controller usb,model=ich9-ehci1,address=0:0:4.7,index=1")
 vinst.add_valid("controller", "--controller usb2")
 vinst.add_invalid("controller", "--controller")  # Missing argument
 vinst.add_invalid("controller", "--controller foo")  # Invalid argument
diff --git a/tests/utils.py b/tests/utils.py
index 957b67b18..44d85620c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -124,10 +124,10 @@ def sanitize_xml_for_define(xml):
 def test_create(testconn, xml):
     xml = sanitize_xml_for_define(xml)
 
-#    try:
-    dom = testconn.defineXML(xml)
-#    except Exception, e:
-#        raise RuntimeError(str(e) + "\n" + xml)
+    try:
+        dom = testconn.defineXML(xml)
+    except Exception, e:
+        raise RuntimeError(str(e) + "\n" + xml)
 
     try:
         dom.create()
diff --git a/tests/xmlparse-xml/change-controllers-in.xml b/tests/xmlparse-xml/change-controllers-in.xml
index 34de7e10e..f26e6b11c 100644
--- a/tests/xmlparse-xml/change-controllers-in.xml
+++ b/tests/xmlparse-xml/change-controllers-in.xml
@@ -22,7 +22,7 @@
     <controller type="ide" index="3"/>
     <controller type="virtio-serial" index="0" ports="32" vectors="17"/>
     <controller type="scsi" index="1"/>
-    <controller type='usb' index='3' model='ich9-uhci3'>
+    <controller type='usb' index='3' model='ich9-ehci1'>
       <master startport='4'/>
       <address type='pci' domain='0' bus='0' slot='4' function='2'/>
     </controller>
diff --git a/tests/xmlparse-xml/change-controllers-out.xml b/tests/xmlparse-xml/change-controllers-out.xml
index 4a26f1a46..5b2145483 100644
--- a/tests/xmlparse-xml/change-controllers-out.xml
+++ b/tests/xmlparse-xml/change-controllers-out.xml
@@ -22,8 +22,7 @@
     <controller type="ide" index="1"/>
     <controller type="virtio-serial" index="7" ports="5"/>
     <controller type="scsi" index="2"/>
-    <controller type="usb" index="9" model="ich9-uhci3">
-      <master startport="2"/>
+    <controller type="usb" index="9" model="ich9-ehci1">
       <address type="pci" domain="0" bus="0" slot="4" function="2"/>
     </controller>
   </devices>
diff --git a/tests/xmlparse-xml/change-redirdev-in.xml b/tests/xmlparse-xml/change-redirdev-in.xml
index 6900914e8..4b8a12a64 100644
--- a/tests/xmlparse-xml/change-redirdev-in.xml
+++ b/tests/xmlparse-xml/change-redirdev-in.xml
@@ -18,7 +18,6 @@
   <devices>
     <emulator>/usr/local/bin/qemu-kvm</emulator>
     <controller type="usb" index="1" model="ich9-ehci1">
-      <master startport="0"/>
       <address type="pci" domain="0" bus="0" slot="4" function="7"/>
     </controller>
     <interface type="user">
diff --git a/tests/xmlparse-xml/change-redirdev-out.xml b/tests/xmlparse-xml/change-redirdev-out.xml
index 238501371..bf9e0417e 100644
--- a/tests/xmlparse-xml/change-redirdev-out.xml
+++ b/tests/xmlparse-xml/change-redirdev-out.xml
@@ -18,7 +18,6 @@
   <devices>
     <emulator>/usr/local/bin/qemu-kvm</emulator>
     <controller type="usb" index="1" model="ich9-ehci1">
-      <master startport="0"/>
       <address type="pci" domain="0" bus="0" slot="4" function="7"/>
     </controller>
     <interface type="user">
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index be4b57915..7dfea3d68 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -41,8 +41,8 @@ class XMLParseTest(unittest.TestCase):
         utils.diff_compare(actualXML, expect_out=expectXML)
 
     def _alter_compare(self, actualXML, outfile):
-        utils.test_create(conn, actualXML)
         utils.diff_compare(actualXML, outfile)
+        utils.test_create(conn, actualXML)
 
     def testRoundTrip(self):
         """
@@ -383,10 +383,10 @@ class XMLParseTest(unittest.TestCase):
         check = self._make_checker(dev4)
         check("type", "usb")
         check("index", "3", "9")
-        check("model", "ich9-uhci3")
+        check("model", "ich9-ehci1")
 
         check = self._make_checker(dev4.get_master())
-        check("startport", "4", "2")
+        check("startport", "4", "2", None)
 
         self._alter_compare(guest.get_xml_config(), outfile)