Author: jcwillia Date: 2010-01-28 18:56:22 +0000 (Thu, 28 Jan 2010) New Revision: 341

Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py trunk/tests/rteval/v7_rteval.py Log: fixed check for RT kernel and added rpm requires

Moved the check for running an RT kernel into the init() method for both rteval and hwlatdetect. Added getRequiredRPMS() method to both as well.

CC: David Sommerseth davids@redhat.com Signed-off-by: Clark Williams williams@redhat.com

Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py =================================================================== --- trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 20:32:35 UTC (rev 340) +++ trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-28 18:56:22 UTC (rev 341) @@ -40,18 +40,36 @@ Test.__init__(self, name="hwlatdetect") self.interactive = False self.data = {} + if os.uname()[3].find(" RT ") == -1: + self.realtime = False + else: + self.realtime = True self.hwlatdetect = None self.deviceClass = DeviceClass.processor self.owner = "Clark Williams williams@redhat.com" self.path = "v7/tests/hwlatdetect" self.version = "0.1" self.description = "hardware latency detector" - self.requires = "rt-setup rt-tests ibm-prtm" + self.requires = ["rt-setup", "rt-tests"] + if self.realtime and self.__read_sys_dmi("sys_vendor") == "IBM": + self.requires.append("ibm-prtm")

+ def getRequiredRPMs(self): + return self.requires + + def __read_sys_dmi(self, name): + try: + f = open("/sys/class/dmi/id/%s" % name, "r") + ret = f.readline().strip() + f.close() + return ret + except IOError: + print "Could not open /sys/class/dmi/id/%s ... are you running the right kernel?" % name + return None + def plan(self, devices): ret = list() - v = os.uname()[3] - if v.find(" RT ") == -1: + if not self.realtime: return ret ret.append(self.makeCopy()) return ret

Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-27 20:32:35 UTC (rev 340) +++ trunk/tests/rteval/v7_rteval.py 2010-01-28 18:56:22 UTC (rev 341) @@ -29,6 +29,10 @@ def __init__(self): Test.__init__(self, name="rteval") self.interactive = False + if os.uname()[3].find(" RT ") == -1: + self.realtime = False + else: + self.realtime = True self.data = {} self.rteval = None self.deviceClass = DeviceClass.processor @@ -36,7 +40,12 @@ self.path = "v7/tests/rteval" self.version = "0.1" self.description = "Realtime hardware evaluation tool" - self.requires = "rt-setup rteval rt-eval-loads rt-tests ibm-prtm" + self.requires = ["rt-setup", "rteval", "rteval-loads", "rt-tests"] + if self.realtime and self.__read_sys_dmi("sys_vendor") == "IBM": + self.requires.append("ibm-prtm") + + def getRequiredRPMs(self): + return self.requires

def __read_sys_dmi(self, name): try: @@ -51,8 +60,7 @@

def plan(self, devices): ret = list() - v = os.uname()[3] - if v.find(" RT ") == -1: + if not self.realtime: return ret

# Check if we have some interesting data from the /sys/class/dmi/id directory