Changeset 29438 for branches/sc_branches/psps_testing/psi/psi_inquisitor.py

Timestamp:

Oct 15, 2010, 2:51:13 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Test report now in xml

File:

• branches/sc_branches/psps_testing/psi/psi_inquisitor.py (modified) (3 diffs)

branches/sc_branches/psps_testing/psi/psi_inquisitor.py

@@ -2 +2 @@
 from suds.xsd.doctor import Import, ImportDoctor
 from suds import sudsobject
+from suds import WebFault
 from utilities.util import psi_convert
 import unicodedata
 from utilities.psps_logger import PsPsLogger
 from utilities.test_report import TestReport
+
+from suds import WebFault
+class PsiException(WebFault):
+    """
+    >>> fault = WebFault('fault', 'document')
+    >>> raise PsiException(fault)
+    Traceback (most recent call last):
+    ...
+    PsiException
+    """
+    def __init__(self, webFault):
+        WebFault.__init__(self, webFault.fault, webFault.document)
 
 class PsiInquisitor:
@@ -31 +44 @@
         TestReport.info('PsiInquisitor created from %s' % configuration_file)
         TestReport.info(self.configuration.str())
+        Client.log = PsPsLogger
         self.authClient = Client(self.configuration.authUrl)
         self.sessionID = self.authClient.service.login(self.configuration.userID, 
@@ -104 +118 @@
         """
         PsPsLogger.debug('Querying PSI: [%s]' % sql_query)
-        results = self.jobsClient.service.executeQuickJob(self.sessionID, 
-                                                          self.configuration.schemaGroup,
-                                                          sql_query, 
-                                                          self.configuration.context)
+        try:
+            results = self.jobsClient.service.executeQuickJob(self.sessionID, 
+                                                              self.configuration.schemaGroup,
+                                                              sql_query, 
+                                                              self.configuration.context)
+        except WebFault, e:
+            raise PsiException(e)
         lines = results.split('\n')
         first_line_not_seen = True