r1162 - trunk/v7
Author: gnichols
Date: 2012-01-23 19:12:16 +0000 (Mon, 23 Jan 2012)
New Revision: 1162
Modified:
trunk/v7/planner.py
Log:
Bug 782197 - FEAT: v7 should support dbus udisks in place of hal/kudzu/hardware.py for
storage test
Modified: trunk/v7/planner.py
===================================================================
--- trunk/v7/planner.py 2012-01-23 19:11:24 UTC (rev 1161)
+++ trunk/v7/planner.py 2012-01-23 19:12:16 UTC (rev 1162)
@@ -28,6 +28,7 @@
from v7.v7kudzu import Kudzu
from v7.udevDeviceDetector import UdevDeviceDetector
from v7.procDeviceDetector import ProcDeviceDetector
+from v7.udisksDeviceDetector import UDisksDeviceDetector
class Planner:
@@ -124,6 +125,8 @@
if self.options.kudzu or not hal.enabled:
kudzu = Kudzu()
self.devices.extend(kudzu.getDevices())
+ udisks = UDisksDeviceDetector()
+ self.devices.extend(udisks.getDevices())
def getTestsFor(self, device):
devices = list()