diff options
author | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2020-11-19 01:16:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-19 01:16:26 +0200 |
commit | fc42b2a23516737a7bbbe396985f31d3c22fd46a (patch) | |
tree | 3099d8be2f40c5f3fe0a3234d707f7485592e694 | |
parent | 07db486dee936c89e7918d5240a67c93c65a1130 (diff) | |
parent | 4f60e0da1bd41289b3ffd84e474bb46a3bcf23e9 (diff) | |
download | pysaml2-fc42b2a23516737a7bbbe396985f31d3c22fd46a.tar.gz |
Merge pull request #748 from brunato/fix-identifier-tests
Fix test_33_identifier.py to avoid reuse of old test data files
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | tests/test_33_identifier.py | 56 | ||||
-rw-r--r-- | tox.ini | 1 |
3 files changed, 38 insertions, 26 deletions
@@ -7,6 +7,10 @@ example/*/modules/ tests/*.log.* tests/*.db +tests/*.dir +tests/*.dat +tests/*.bak + eptid @@ -117,6 +121,9 @@ venv.bak/ # Visual Studio Code files .vscode/ +# PyCharm project files +.idea/ + # mkdocs documentation /site diff --git a/tests/test_33_identifier.py b/tests/test_33_identifier.py index 86e2003d..6f11f7fe 100644 --- a/tests/test_33_identifier.py +++ b/tests/test_33_identifier.py @@ -7,34 +7,39 @@ from saml2.config import IdPConfig from saml2.ident import IdentDB from saml2.assertion import Policy -def _eq(l1,l2): +from pathutils import full_path + + +def _eq(l1, l2): return set(l1) == set(l2) + CONFIG = IdPConfig().load({ - "entityid" : "urn:mace:example.com:idp:2", - "name" : "test", + "entityid": "urn:mace:example.com:idp:2", + "name": "test", "service": { "idp": { - "endpoints" : { - "single_sign_on_service" : ["http://idp.example.org/"], - }, + "endpoints": { + "single_sign_on_service": ["http://idp.example.org/"], + }, "policy": { "default": { - "lifetime": {"minutes":15}, - "attribute_restrictions": None, # means all I have - "name_form": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", + "lifetime": {"minutes": 15}, + "attribute_restrictions": None, # means all I have + "name_form": + "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", "nameid_format": NAMEID_FORMAT_PERSISTENT } } } }, - "virtual_organization" : { - "http://vo.example.org/biomed":{ - "nameid_format" : "urn:oid:2.16.756.1.2.5.1.1.1-NameID", + "virtual_organization": { + "http://vo.example.org/biomed": { + "nameid_format": "urn:oid:2.16.756.1.2.5.1.1.1-NameID", "common_identifier": "uid", }, - "http://vo.example.org/design":{ - "nameid_format" : NAMEID_FORMAT_PERSISTENT, + "http://vo.example.org/design": { + "nameid_format": NAMEID_FORMAT_PERSISTENT, "common_identifier": "uid", } } @@ -53,13 +58,14 @@ NAME_ID_POLICY_2 = """<?xml version="1.0" encoding="utf-8"?> """ -class TestIdentifier(): +class TestIdentifier: def setup_class(self): - try: - os.remove("subject.db.db") - except: - pass - self.id = IdentDB("subject.db", "example.com", "example") + for extension in ('.db', '.dir', '.dat', '.bak'): + try: + os.remove(full_path("subject.db{}".format(extension))) + except (OSError, IOError): + pass + self.id = IdentDB(full_path("subject.db"), "example.com", "example") def test_persistent_1(self): policy = Policy({ @@ -80,9 +86,9 @@ class TestIdentifier(): assert nameid.sp_name_qualifier == "urn:mace:example.com:sp:1" assert nameid.format == NAMEID_FORMAT_PERSISTENT - id = self.id.find_local_id(nameid) + id_ = self.id.find_local_id(nameid) - assert id == "foobar" + assert id_ == "foobar" def test_persistent_2(self): userid = 'foobar' @@ -161,7 +167,6 @@ class TestIdentifier(): assert nameid.format == NAMEID_FORMAT_PERSISTENT assert nameid.text != "foobar01" - def test_persistent_nameid(self): sp_id = "urn:mace:umu.se:sp" nameid = self.id.persistent_nameid("abcd0001", sp_id) @@ -187,6 +192,5 @@ class TestIdentifier(): assert nameid.text.strip() != nameid2.text.strip() def teardown_class(self): - if os.path.exists("subject.db"): - os.unlink("subject.db") - + if os.path.exists(full_path("subject.db")): + os.unlink(full_path("subject.db")) @@ -3,6 +3,7 @@ envlist = py36 py37 py38 + py39 pypy3 [testenv] |