Attachment 574609 Details for Bug 807714 – planner patch to only use udisks on RHEL 6 and beyond, and all other products

[patch] planner patch to only use udisks on RHEL 6 and beyond, and all other products

planner.patch (text/plain), 1.31 KB, created by Greg Nichols on 2012-04-02 19:46:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-04-02 19:46:26 UTC

Size: 1.31 KB

patch

obsolete

>Index: planner.py
>===================================================================
>--- planner.py	(revision 1192)
>+++ planner.py	(working copy)
>@@ -37,7 +37,7 @@
>     dictionaries, and provides lists of test(s) by various criteria
>     """
>     
>-    def __init__(self, options, virtualization):
>+    def __init__(self, options, virtualization, redHatRelease):
>         self.options = options
>         self.Debugging = self.options.debug != Constants.off
>         self.deviceTests = list()
>@@ -46,6 +46,7 @@
>         self.devices = list()
>         self.virtualization = virtualization
>         self.plannedTests = list()
>+        self.redHatRelease = redHatRelease
> 
>     def analyse(self, testDirectory):
>         """Walk through the test directory looking for v7.Test classes"""
>@@ -125,8 +126,10 @@
>         if not hal.enabled:
>             kudzu = Kudzu()
>             self.devices.extend(kudzu.getDevices())
>-        udisks = UDisksDeviceDetector()
>-        self.devices.extend(udisks.getDevices())
>+        # run udisks only on RHEL 6 and beyond
>+        if not "Red Hat Enterprise Linux" in self.redHatRelease.getProduct() or self.redHatRelease.getVersion() > 5: 
>+            udisks = UDisksDeviceDetector()
>+            self.devices.extend(udisks.getDevices())
> 
>     def getTestsFor(self, device):
>         devices = list()

Actions: View | Diff

Attachments on bug 807714: 574608 | 574609