Attachment 918144 Details for Bug 1119696 – patch v2

[patch] patch v2

0001-1119696-force-both-USB-and-PCIE-subtests-on-expressc.patch (text/plain), 5.83 KB, created by Guangze Bai on 2014-07-15 11:11:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guangze Bai

Created: 2014-07-15 11:11:43 UTC

Size: 5.83 KB

patch

obsolete

>From c290a2f618a9c8f26aaf6ff13e60fb261b54e0c5 Mon Sep 17 00:00:00 2001
>From: Guangze Bai <gbai@redhat.com>
>Date: Tue, 15 Jul 2014 18:48:54 +0800
>Subject: [PATCH] 1119696 - force both USB and PCIE subtests on expresscard
> test
>
>Signed-off-by: Guangze Bai <gbai@redhat.com>
>---
> tests/expresscard/expresscard.py |   91 ++++++++++++++++++++++----------------
> 1 file changed, 52 insertions(+), 39 deletions(-)
>
>diff --git a/tests/expresscard/expresscard.py b/tests/expresscard/expresscard.py
>index 3bb63d6..13d6b27 100644
>--- a/tests/expresscard/expresscard.py
>+++ b/tests/expresscard/expresscard.py
>@@ -110,14 +110,14 @@ class ExpressCardTest(USBTestBase):
>                 self.pluggedInPCIDevices.append(id)
>                 print "  %s appears to be attached on PCI bus: %s" % (name, id)
> 
>-    def addNewPCIPlugged(self, verifiedDevices):
>+    def addNewPCIPlugged(self, verifiedDevices=[]):
>         devices = self.getPCIDevices()
>         if not devices:
>             return None
>         for dev in devices:
>             (id, name) = dev
>             # should execute checkAllPCIUnplugged() first
>-            if id and not id in self.pluggedInPCIDevices:
>+            if id and id not in self.pluggedInPCIDevices:
>                 if id in verifiedDevices:
>                     print "\n  Note: Same device been plugged into the same slot.\n"
>                     return None
>@@ -185,64 +185,77 @@ class ExpressCardTest(USBTestBase):
> 
>         # ask user how many ExpressCard slots there are
>         while True:
>-            i = self.promptInteger("\nHow many ExpressCard slots are there ? ")
>+            i = self.promptInteger(
>+                "\nHow many ExpressCard slots are there ? ")
>             if i > 0:
>                 self.numSlots = i
>                 break
>             print "Please enter a positive integer."
> 
>         while i > 0:
>-            print "\nTesting slot %s of %s..." % (self.numSlots - i + 1, self.numSlots)
>-
>-            isUSB = False
>+            print "\nTesting slot %s of %s..." % (
>+                self.numSlots - i + 1, self.numSlots)
> 
>             # gather HW info
>             pciInfo1  = self.pciInfo()
>             udevInfo1 = self.udevInfo()
> 
>-            if not self.promptContinue("Please plug in an ExpressCard device"):
>-                result = Constants.ABORT
>-                return FAILED
>+            while True:
>+                if not self.promptContinue(
>+                    "Please plug in an ExpressCard using USB bus"):
>+                    result = Constants.ABORT
>+                    return FAILED
> 
>-            time.sleep(5)
>-            found = self.addNewPluggedUSBPort()
>-            if found:
>-                isUSB = True
>-            else:
>-                found = self.addNewPCIPlugged(verifiedDevs)
>-                if not found:
>-                    print "Error: Device not found !\n" "Please retry"
>+                time.sleep(3)
>+                found = self.addNewPluggedUSBPort()
>+                if found:
>+                    (busID, portID, name, deviceID) = found
>+                    # gather HW info a second time
>+                    pciInfo2  = self.pciInfo()
>+                    udevInfo2 = self.udevInfo()
>+                else:
>                     continue
> 
>-            # gather HW info a second time
>-            pciInfo2  = self.pciInfo()
>-            udevInfo2 = self.udevInfo()
>-            
>-            if not self.promptContinue("Please unplug the ExpressCard device."):
>-                result = Constants.ABORT
>-                return FAILED
>+                if not self.promptContinue("Please unplug the ExpressCard"):
>+                    result = Constants.ABORT
>+                    return FAILED
> 
>-            time.sleep(5)
>-            if isUSB:
>-                (busID, portID, name, deviceID) = found
>+                time.sleep(3)
>                 if self.confirmUSBPortUnplugged(deviceID):
>-                    print "Unplugged USB device\n    %s (%s)" % (name, deviceID)
>-                    verifiedDevs.append(deviceID)
>-                    self.pluggedInDevices.append(deviceID)
>-                else:
>-                    print "Error: unplug failed as the device still recognized."
>+                    print "Unplugged USB device\n    %s (%s)" % (
>+                        name, deviceID)
>+                    break
>+
>+                print "Error: unplug failed as the card still recognized."
>+                return FAILED
>+
>+            while True:
>+                if not self.promptContinue(
>+                    "Please plug in an ExpressCard using PCIe bus"):
>+                    result = Constants.ABORT
>                     return FAILED
> 
>-            else:
>-                deviceID = found
>-                if self.confirmPCIUnplugged(deviceID):
>-                    print "Unplugged PCIE device\n    %s" % deviceID
>-                    verifiedDevs.append(deviceID)
>-                    self.pluggedInPCIDevices.append(deviceID)
>+                time.sleep(3)
>+                deviceID = self.addNewPCIPlugged()
>+                if deviceID:
>+                    # gather HW info a second time
>+                    pciInfo2  = self.pciInfo()
>+                    udevInfo2 = self.udevInfo()
>                 else:
>-                    print "Error: unplug failed as the device still recognized."
>+                    continue
>+
>+                if not self.promptContinue("Please unplug the ExpressCard"):
>+                    result = Constants.ABORT
>                     return FAILED
> 
>+                time.sleep(3)
>+                if self.confirmPCIUnplugged(deviceID):
>+                    print "Unplugged PCIe device\n    %s" % deviceID
>+                    break
>+
>+                print "Error: unplug failed as the card still recognized."
>+                return FAILED
>+
> 
>             # print out the detailed HW info for reviewers
>             pciDiff  = self.contextDiff(pciInfo1, pciInfo2)
>-- 
>1.7.10.4
>

Flags:

gbai: review?

Actions: View | Diff

Attachments on bug 1119696: 918144