Attachment 687255 Details for Bug 903959 – complete remove HAL

[patch] complete remove HAL

0001-903959-optical-disk-tests-completely-remove-HAL.patch (text/plain), 4.81 KB, created by Caspar Zhang on 2013-01-25 06:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caspar Zhang

Created: 2013-01-25 06:50:16 UTC

Size: 4.81 KB

patch

obsolete

>From f63e519e5997253557e6f03a97d59d4aa69e08a4 Mon Sep 17 00:00:00 2001
>From: Caspar Zhang <czhang@redhat.com>
>Date: Fri, 25 Jan 2013 14:45:55 +0800
>Subject: [PATCH] 903959: optical disk tests: completely remove HAL
>
>Signed-off-by: Caspar Zhang <czhang@redhat.com>
>---
> v7/opticalDiskTest.py | 63 +++++++--------------------------------------------
> 1 file changed, 8 insertions(+), 55 deletions(-)
>
>diff --git a/v7/opticalDiskTest.py b/v7/opticalDiskTest.py
>index 911c778..2f2e171 100644
>--- a/v7/opticalDiskTest.py
>+++ b/v7/opticalDiskTest.py
>@@ -31,7 +31,6 @@ from v7.test import Test
> from v7.tags import Constants
> from v7.device import Device
> from v7.command import Command, V7CommandException
>-from v7.hal import Hal
> from v7.udevDeviceDetector import UdevDeviceDetector
> 
> class OpticalDiskTest(Test):
>@@ -41,7 +40,6 @@ class OpticalDiskTest(Test):
>         self.mediaTypes = None # subclasses must set this list
>         self.supportedMedia = None
>         self.deviceClass = "CDROM"
>-        self.useHal = False
> 
>     def plan(self, planner):
>         tests = dict()
>@@ -61,45 +59,12 @@ class OpticalDiskTest(Test):
>         if tests:
>             return tests.values()
> 
>-        # else (udev fails to find the device, fallback to use HAL)
>-        self.useHal = True
>-        devices = planner.getHalDeviceDetector().getDevices()
>-        for device in devices:
>-            disk = None
>-            if 'storage.cdrom' in device.getProperty("info.capabilities") and self.hasAnyCDROMTypeHAL(device):
>-                disk = self.getDeviceNameHAL(device)
>-
>-            if disk and not disk in tests:
>-                test = self.makeCopy()
>-                test.setDevice(device)
>-                test.setLogicalDeviceName(disk)
>-                tests[disk] = test
>-
>-        return tests.values()
>-
>     def getRequiredRPMs(self):
>         # mkisofs included in genisoimage
>         # cdrecord included in wodim
>         rpms = [ "dvd+rw-tools", "genisoimage", "wodim", "eject" ]
>         return rpms
> 
>-    ##########################################################################
>-    ### TODO: HAL is deprecated, for fallback mode only
>-    def hasAnyCDROMTypeHAL(self, device):
>-        for type in self.mediaTypes:
>-            if device.getProperty("storage.cdrom.%s" % type):
>-                return True
>-        return False
>-
>-    def getDeviceNameHAL(self, device):
>-        disk = device.getProperty("block.device")
>-        """ chop off /dev/ (5 characters) """
>-        if disk and len(disk) > 5:
>-            disk = disk[5:]
>-            return disk
>-        return None
>-    ##########################################################################
>-
>     def hasAnyCDROMType(self, device):
>         for type in self.mediaTypes:
>             if device.getProperty("ID_CDROM_%s" % self.convertMediaNameUdev(type)) == "1":
>@@ -230,31 +195,19 @@ class OpticalDiskTest(Test):
> 
>         return writeMode
> 
>-    # TODO: remove HAL codes after HAL is completely deprecated.
>     def getSupportedMedia(self):
>         """configure the cdrom based on Udev info, return all supported features.
>            we check CD/CD_R/CD_RW/DVD/DVD_R/DVD_RW/DVD_PLUS_R/DVD_PLUS_RW/BD/BD_R/BD_RE"""
>         self.supportedMedia = list()
>         if self.udi:
>-            if not self.useHal:
>-                cdromDevice = UdevDeviceDetector().getDevice(self.udi)
>-                if not cdromDevice:
>-                    print "Error: could not find device with udi = %s" % self.udi
>-                    return # return empty list
>-
>-                for mediaType in self.mediaTypes:
>-                    if cdromDevice.getProperty("ID_CDROM_%s" % self.convertMediaNameUdev(mediaType)):
>-                        self.supportedMedia.append(mediaType) # return the most-preferred (first)
>-
>-            else: #TODO remove HAL codes once HAL is completely deprecated.
>-                cdromDevice = Hal().getDevice(self.udi)
>-                if not cdromDevice:
>-                    print "Warning: could not find device with udi = %s" % self.udi
>-                    return # return empty list
>-
>-                for mediaType in self.mediaTypes:
>-                    if cdromDevice.getProperty("storage.cdrom.%s" % mediaType):
>-                        self.supportedMedia.append(mediaType) # return the most-preferred (first)
>+            cdromDevice = UdevDeviceDetector().getDevice(self.udi)
>+            if not cdromDevice:
>+                print "Error: could not find device with udi = %s" % self.udi
>+                return # return empty list
>+
>+            for mediaType in self.mediaTypes:
>+                if cdromDevice.getProperty("ID_CDROM_%s" % self.convertMediaNameUdev(mediaType)):
>+                    self.supportedMedia.append(mediaType) # return the most-preferred (first)
> 
>             # always add least-preferred one (last).
>             if not mediaType in self.supportedMedia:
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 903959: 687255