summaryrefslogtreecommitdiff
path: root/tests/test_50_server.py
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2019-07-08 21:14:54 +0300
committerIvan Kanakarakis <ivan.kanak@gmail.com>2019-07-08 21:14:54 +0300
commit124376b3a707edf354fcc2e7311a86af864cf647 (patch)
treec95dce6d8ad14ff995f18b7a06e8006d29a677c7 /tests/test_50_server.py
parent5a435953afbc71405c777ab658d9fc1394931277 (diff)
downloadpysaml2-124376b3a707edf354fcc2e7311a86af864cf647.tar.gz
Fix tests to be compatible with latest pytest
Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
Diffstat (limited to 'tests/test_50_server.py')
-rw-r--r--tests/test_50_server.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_50_server.py b/tests/test_50_server.py
index ecef319e..3d828171 100644
--- a/tests/test_50_server.py
+++ b/tests/test_50_server.py
@@ -30,7 +30,7 @@ from saml2.soap import make_soap_enveloped_saml_thingy
from saml2 import BINDING_HTTP_POST
from saml2 import BINDING_HTTP_REDIRECT
-from py.test import raises
+from pytest import raises
from pathutils import full_path
import saml2.xmldsig as ds
@@ -220,8 +220,8 @@ class TestServer1():
binding, "%s" % authn_request, "http://www.example.com", "abcd")
_dict = parse_qs(htargs["headers"][0][1].split('?')[1])
print(_dict)
- raises(OtherError, self.server.parse_authn_request,
- _dict["SAMLRequest"][0], binding)
+ with raises(OtherError):
+ self.server.parse_authn_request(_dict["SAMLRequest"][0], binding)
def test_parse_faulty_request_to_err_status(self):
req_id, authn_request = self.client.create_authn_request(
@@ -1294,8 +1294,8 @@ class TestServer1NonAsciiAva():
binding, "%s" % authn_request, "http://www.example.com", "abcd")
_dict = parse_qs(htargs["headers"][0][1].split('?')[1])
print(_dict)
- raises(OtherError, self.server.parse_authn_request,
- _dict["SAMLRequest"][0], binding)
+ with raises(OtherError):
+ self.server.parse_authn_request(_dict["SAMLRequest"][0], binding)
def test_parse_faulty_request_to_err_status(self):
req_id, authn_request = self.client.create_authn_request(