File tree Expand file tree Collapse file tree 3 files changed +8
-6
lines changed Expand file tree Collapse file tree 3 files changed +8
-6
lines changed Original file line number Diff line number Diff line change 16
16
from saml2 .mdstore import MetadataStore , ToOld
17
17
from saml2 .mdstore import MetaData
18
18
19
- from saml2test import FatalError , OperationError
19
+ from saml2test import CheckError , FatalError
20
20
from saml2test import exception_trace
21
21
from saml2test import ContextFilter
22
22
@@ -318,7 +318,7 @@ def run(self):
318
318
self .test_log = conv .test_output
319
319
tsum = self .test_summation (self .args .oper )
320
320
err = None
321
- except OperationError , err :
321
+ except CheckError , err :
322
322
self .test_log = conv .test_output
323
323
tsum = self .test_summation (self .args .oper )
324
324
except FatalError , err :
Original file line number Diff line number Diff line change 13
13
from saml2 .s_utils import rndstr
14
14
15
15
from saml2test import tool
16
- from saml2test import FatalError
16
+ from saml2test import CheckError , FatalError
17
17
from saml2test .interaction import InteractionNeeded
18
18
19
19
try :
@@ -248,6 +248,8 @@ def handle_result(self):
248
248
raise
249
249
except ElementTree .ParseError :
250
250
return False
251
+ except CheckError :
252
+ raise
251
253
except Exception , err :
252
254
if _resp :
253
255
logger .info ("Faulty response: %s" % _resp )
Original file line number Diff line number Diff line change 5
5
from urlparse import parse_qs
6
6
7
7
from saml2test .opfunc import Operation
8
- from saml2test import FatalError
8
+ from saml2test import CheckError , FatalError
9
9
from saml2test .check import ExpectedError , ERROR
10
- from saml2test .check import INTERACTION
11
10
from saml2test .interaction import Interaction
12
11
from saml2test .interaction import Action
13
12
from saml2test .interaction import InteractionNeeded
14
13
from saml2test .status import STATUSCODE
14
+ from saml2test .status import INTERACTION
15
15
from saml2test import OperationError
16
16
17
17
__author__ = 'rolandh'
@@ -61,7 +61,7 @@ def check_severity(self, stat):
61
61
except KeyError :
62
62
pass
63
63
64
- raise FatalError
64
+ raise CheckError
65
65
66
66
def do_check (self , test , ** kwargs ):
67
67
if isinstance (test , basestring ):
You can’t perform that action at this time.
0 commit comments