Author: gnichols
Date: 2010-03-04 19:06:54 +0000 (Thu, 04 Mar 2010)
New Revision: 412
Modified:
trunk/tests/info/info.py
Log:
555895 - FEAT: results.xml could divide out the various sub tests.
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2010-03-04 19:06:34 UTC (rev 411)
+++ trunk/tests/info/info.py 2010-03-04 19:06:54 UTC (rev 412)
@@ -149,6 +149,8 @@
rpmVerify = Command("rpm -V --nomtime --nomode --nocontexts v7")
try:
rpmVerify.echo()
+ if len(rpmVerify.output) > 0 and "not installed" in
rpmVerify.output[0]:
+ return False
return True
except V7CommandException, e:
print "Verification of v7 rpm failed"
@@ -406,28 +408,17 @@
def run(self):
success = True
-
- if self.checkKernel():
- print "Kernel check passed."
- else:
+ if not self.runSubTest(self.checkKernel, name="Kernel",
description="Check OS kernel build, version"):
success = False
- print "Error: Kernel check failed."
- if self.checkV7():
- print "v7 Verify passed"
- else:
+ if not self.runSubTest(self.checkV7, name="Verify v7",
description="Verify the v7 installation"):
success = False
- print "Error: v7 verification failed."
- if self.checkModules():
- print "Module check passed"
- else:
+ if not self.runSubTest(self.checkModules, name="Modules",
description="Check kernel modules"):
success = False
- print "Error: Module check failed"
- if not self.generateSystemReport():
+ if not self.runSubTest(self.generateSystemReport, name="System Report",
description="generate system report"):
success = False
- print "Error: sysreport failed"
if success:
return 0
Show replies by date