Attachment 678797 Details for Bug 895407 – info patch moving dmidecode to a subtest and changing its output logging

[patch] info patch moving dmidecode to a subtest and changing its output logging

info.patch (text/plain), 1.90 KB, created by Greg Nichols on 2013-01-15 14:38:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-01-15 14:38:27 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/tests/info/info.py b/tests/info/info.py
>index 3e76f2f..bc60243 100644
>--- a/tests/info/info.py
>+++ b/tests/info/info.py
>@@ -29,6 +29,7 @@ class InfoTest(Test):
>     
>     def __init__(self):
>         Test.__init__(self, name="info")
>+        self.dmidecode = "/usr/sbin/dmidecode"
>         self.deviceClass = DeviceClass.system
>         self.mandatory = Constants.post # required at the end of each run
>         # what RHEL are we testing?
>@@ -551,15 +552,19 @@ class InfoTest(Test):
>             # if that fails, leave off --no-progressbar
>             if not result:
>                 result = self.__processSystemReport("sosreport --batch -n selinux")
>-      
>-       
>-        dmidecode = "/usr/sbin/dmidecode"
>-        if os.path.exists(dmidecode):
>-            if not os.system(dmidecode) is 0:
>-                print "Note: %s returned an error." % (dmidecode)
>-               
>        
>         return result
>+    
>+    def logDmidecode(self):
>+        if os.path.exists(self.dmidecode):
>+            try:
>+                Command(self.dmidecode).echo()
>+            except V7CommandException, e:
>+                print "Error: %s failed." % self.dmidecode 
>+                print e
>+                return False
>+        # otherwise
>+        return True
>    
>     def __processSystemReport(self, reportCommand):  
>         pipe = os.popen("echo -e '\n\n' | %s -k rpm.rpmva=off 2>&1" % reportCommand)
>@@ -613,6 +618,9 @@ class InfoTest(Test):
> 
>         if not self.runSubTest(self.checkSELinux, name="SE Linux", description="Capture SE Linux status"):
>             success = False
>+            
>+        if os.path.exists(self.dmidecode) and not self.runSubTest(self.logDmidecode, name="dmidecode", description="Log dmidecode output"):
>+            success = False
>         
>         if not self.runSubTest(self.generateSystemReport, name="System Report", description="generate system report"):
>             success = False

Actions: View | Diff

Attachments on bug 895407: 678797