8:09 a.m.
Author: gnichols
Date: 2012-02-03 14:09:14 +0000 (Fri, 03 Feb 2012)
New Revision: 1170
Modified:
trunk/v7/hardwaretest.py
Log:
782229 - FEAT: v7 certify should support component mode\n 782195 - FEAT: v7 certify should
only run rtevel and hwlatdetect (and info) on the RT kernel\n 702168 - RedHat v7-1.3-35
Hardware Test Suite: v7 server requires fence-agents rpm
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2012-01-30 13:54:52 UTC (rev 1169)
+++ trunk/v7/hardwaretest.py 2012-02-03 14:09:14 UTC (rev 1170)
@@ -283,6 +283,12 @@
def getVirtualization(self):
return self.virtualization
+
+ def isRealtime(self):
+ if os.uname()[3].find(" RT ") == -1:
+ self.realtime = False
+ else:
+ self.realtime = True
def doPlan(self):
self.checkVirtualization()
@@ -488,11 +494,7 @@
testCount = 0
tests = planner.getServerModeTests();
result = 0
- # check server=specific rpms
- if subcommand == "start":
- # server web CGI uses XSLT via python-lxml
- if not self.installRequiredRPMs({"fence-agents":
"fence-agents"}):
- result = 1
+
for test in tests:
print "%s test server %s:" % (test.Name(), subcommand)
rv = self.runServer(test, subcommand)
@@ -866,20 +868,37 @@
engine = ResultsEngine(self.certification)
tests = engine.getRemainingTests()
+ # for realtime kernel, just look for remaining realtime tests
+ if self.isRealtime():
+ tests = self.certification.getTaggedTests(tests, [TestTag.realtime])
+
# filter remaining tests via tags
- if self.options.tag:
+ elif self.options.tag:
tests = self.certification.getTaggedTests(tests, self.options.tag)
+ # filter by device (AKA component-level certify command)
+ if self.options.udi or self.options.device:
+ tests = self.certification.getDeviceTests(self.options, tests)
+
if len(tests) > 0:
if not self.__checkResultsSize():
return False
tests = self.addMandatoryTests(tests)
if not tests:
return False
- if not self.options.tag:
+
+
+ deviceName = ""
+ if self.options.device:
+ deviceName = self.options.device
+ if self.options.udi:
+ deviceName += " (" + ", ".join(self.options.udi) +
")"
+ if deviceName:
+ print "\nThe following component tests for device %s with tag(s)
[%s] are recommended:" % (deviceName, ", ".join(self.options.tag))
+ elif self.options.tag == [TestTag.certification]:
print "\nThe following tests are recommended to complete the
certification:"
else:
- print "\nThe following tests with tag(s) [%s] are recommended to
continue the certification" % (", ".join(self.options.tag))
+ print "\nThe following tests with tag(s) [%s] are recommended:"
% (", ".join(self.options.tag))
for test in tests:
print "%-10s %-10s %-36s" % (test.getName(),
test.getLogicalDeviceName(), test.getShortUDI())