More changes (missed a prev. commit) Error reporting clarified: CRITICAL level for unexpected conditions in saml2test; ERROR and lower for conditions in the test target; various documentation improvements

Author: rhoerbe

src/sp_test/__init__.py

@@ -19,6 +19,7 @@
 from saml2test import CheckError
 from saml2test import ContextFilter
 from saml2test import exception_trace
+from saml2test.check import CRITICAL
 
 __author__ = 'rolandh'
 
@@ -201,11 +202,17 @@ def run(self):
             tsum = self.test_summation(self.args.oper)
         except Exception, err:
             if conv:
+                conv.test_output.append({"status": CRITICAL,
+                         "name": "test driver error",
+                         "id": "critial exception"})
                 self.test_log = conv.test_output
                 self.test_log.append(exception_trace("RUN", err))
             else:
                 self.test_log = exception_trace("RUN", err)
             tsum = self.test_summation(self.args.oper)
+            logger.error("Unexpected exception in test driver %s" %
+                         traceback.format_exception(*sys.exc_info()))
+
 
         if pp:
             pp.pprint(tsum)

src/sp_test/base.py

@@ -75,7 +75,7 @@ def __init__(self, instance, config, interaction, json_config,
         self.start_page = json_config["start_page"]
 
     def check_severity(self, stat):
-        if stat["status"] >= 4:
+        if stat["status"] >= 3:
             logger.error("WHERE: %s" % stat["id"])
             logger.error("STATUS:%s" % STATUSCODE[stat["status"]])
             try:
@@ -154,18 +154,12 @@ def wb_send_GET_startpage(self):
         self.last_response = self.instance.send(self.start_page)
         self._log_response(self.last_response)
 
-    def handle_result(self, response=None):
-        #self.do_check(CheckHTTPResponse)
-        if response:
-            if isinstance(response(), VerifyEchopageContents):
+    def handle_result(self, check_response=None):
+        if check_response:
+            if isinstance(check_response(), Check):
                 if 300 < self.last_response.status_code <= 303:
                     self._redirect(self.last_response)
-                    if self.last_response.status_code >= 400:
-                        raise FatalError("Did not expected SP redirecting to "
-                                         "an error page")
-                self.do_check(response)
-            elif isinstance(response(), Check):
-                self.do_check(response)
+                self.do_check(check_response)
             else:
                 # A HTTP redirect or HTTP Post
                 if 300 < self.last_response.status_code <= 303:
@@ -334,6 +328,10 @@ def send_idp_response(self, req_flow, resp_flow):
             info["headers"] = {
                 'Content-type': 'application/x-www-form-urlencoded'}
             self.last_response = self.instance.send(**info)
+            try:
+                self.last_content = self.last_response.content
+            except AttributeError:
+                self.last_content = None
 
         self._log_response(self.last_response)
 

src/sp_test/check.py

@@ -5,7 +5,7 @@
 
 from saml2 import BINDING_HTTP_REDIRECT
 from saml2test.check import Check
-from saml2test.check import CRITICAL
+from saml2test.check import ERROR, INFORMATION, WARNING
 from saml2test import check
 from saml2test.interaction import Interaction