r515 - trunk/tests/info
Author: gnichols
Date: 2010-05-26 14:40:31 +0000 (Wed, 26 May 2010)
New Revision: 515
Modified:
trunk/tests/info/info.py
Log:
591357 - RHEL6 info test: no --no-progressbar option for sosreport
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2010-05-26 14:38:33 UTC (rev 514)
+++ trunk/tests/info/info.py 2010-05-26 14:40:31 UTC (rev 515)
@@ -314,9 +314,13 @@
def generateSystemReport(self):
outputDirectory = os.getcwd()
- reportCommand = "sosreport -n selinux --no-progressbar"
- if "Red Hat" in self.redHatRelease.getProduct() and
self.redHatRelease.getVersion() == 4:
- reportCommand = "sysreport"
+ reportCommand = "sosreport -n selinux"
+ if "Red Hat" in self.redHatRelease.getProduct():
+ if self.redHatRelease.getVersion() == 4:
+ reportCommand = "sysreport"
+ elif self.redHatRelease.getVersion() == 5:
+ reportCommand = reportCommand + " --no-progressbar"
+
pipe = os.popen("echo -e '\n\n' | %s -k rpm.rpmva=off
2>&1" % reportCommand)
result = False
while True: