Attachment 835025 Details for Bug 1022749 – Patch V2 Fix the traceback when the xml file is not valid

[patch] Patch V2 Fix the traceback when the xml file is not valid

0001-1022749-traceback-on-empty-results.xml-file.patch (text/plain), 3.53 KB, created by Dong Zhu on 2013-12-11 02:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dong Zhu

Created: 2013-12-11 02:25:06 UTC

Size: 3.53 KB

patch

obsolete

>From 1ae15595cec6905247ef0cb17bbe8f331310a426 Mon Sep 17 00:00:00 2001
>From: Dong Zhu <dzhu@redhat.com>
>Date: Wed, 11 Dec 2013 10:15:29 +0800
>Subject: [PATCH] 1022749 - traceback on empty results.xml file
>
>Signed-off-by: Dong Zhu <dzhu@redhat.com>
>---
> hwcert/certificationtest.py | 19 +++++++++++--------
> hwcert/documentbase.py      | 10 +++++++---
> hwcert/harness.py           |  5 +++--
> 3 files changed, 21 insertions(+), 13 deletions(-)
>
>diff --git a/hwcert/certificationtest.py b/hwcert/certificationtest.py
>index c257891..f2bfd45 100644
>--- a/hwcert/certificationtest.py
>+++ b/hwcert/certificationtest.py
>@@ -180,14 +180,17 @@ class ResultsDocument(CertificationDocument):
>         
>     def load(self, filename):
>         DocumentBase.load(self, filename)
>-        self.deviceClasses = dict()
>-        deviceClassElements = list()
>-        for element in self.document.documentElement.childNodes:
>-            if element.nodeName == Tags.device_class:
>-                deviceClassElements.append(element)
>-        for deviceClassElement in deviceClassElements:
>-            deviceClass = deviceclassdocument.GetDeviceClass(deviceClassElement, self.document)     
>-            self.deviceClasses[deviceClass.getName()] = deviceClass
>+        if self.document:
>+            self.deviceClasses = dict()
>+            deviceClassElements = list()
>+            for element in self.document.documentElement.childNodes:
>+                if element.nodeName == Tags.device_class:
>+                    deviceClassElements.append(element)
>+            for deviceClassElement in deviceClassElements:
>+                deviceClass = deviceclassdocument.GetDeviceClass(deviceClassElement, self.document)
>+                self.deviceClasses[deviceClass.getName()] = deviceClass
>+            return True
>+        return False
>             
>     def importElement(self, topElement):
>         DocumentBase.importElement(self, topElement)
>diff --git a/hwcert/documentbase.py b/hwcert/documentbase.py
>index f28bd56..8ef1dc2 100644
>--- a/hwcert/documentbase.py
>+++ b/hwcert/documentbase.py
>@@ -264,16 +264,20 @@ class DocumentBase(DocumentWrapper):
>         if filename[-2:] == "gz":
>             file = gzip.open(filename, 'rb')
>             self.loadedFileSize = os.path.getsize(self.loadedFilePath)
>-            self.document = parse(file)
>-            file.close()
>         else:
>             try:
>                 self.loadedFileSize = os.path.getsize(self.loadedFilePath) # bytes
>             except OSError:
>                 pass
>             file = open(filename, "r")
>+        try:
>             self.document = parse(file)
>-            file.close()
>+        except Exception, e:
>+            print "Error: could not parse %s" % filename
>+            print e
>+            self.document = None
>+
>+        file.close()
>         
>     def save(self, filename):
>         file = open(filename, "w")
>diff --git a/hwcert/harness.py b/hwcert/harness.py
>index 281a6e5..ddaee92 100644
>--- a/hwcert/harness.py
>+++ b/hwcert/harness.py
>@@ -54,10 +54,11 @@ class HardwareTestHarness(Controller):
>     def load(self):
>         try:
>             self.certification = ResultsDocument(self.options.debug != Constants.off)
>-            self.certification.load(self.environment.getResultsPath())
>+            if not self.certification.load(self.environment.getResultsPath()):
>+                self.certification = None
>         except IOError:
>             self.certification = None
>-            return
>+        return
> 
>     def doDiscover(self):
>         self.certification = ResultsDocument(self.options.debug != Constants.off)
>-- 
>1.8.3.1
>

Flags:

gnichols: review+

Actions: View | Diff

Attachments on bug 1022749: 834217 | 835025