Skip to content

Commit f00e0dd

Browse files
author
Ioannis Kakavas
committed
Modified test cases to include acs in the args
Since acs can't be None ( it get's a value in __init__() https://github.com/rohe/pysaml2/blob/master/src/saml2/assertion.py#L319) there is no reason to test for it. So we add a default value to acs using ac_factory() before passing it to filter_on_attributes
1 parent 5bcb6ac commit f00e0dd

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tests/test_20_assertion.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def test_filter_on_attributes_0():
6464
required = [a]
6565
ava = {"serialNumber": ["12345"]}
6666

67-
ava = filter_on_attributes(ava, required)
67+
ava = filter_on_attributes(ava, required, acs=ac_factory())
6868
assert list(ava.keys()) == ["serialNumber"]
6969
assert ava["serialNumber"] == ["12345"]
7070

@@ -76,7 +76,7 @@ def test_filter_on_attributes_1():
7676
required = [a]
7777
ava = {"serialNumber": ["12345"], "givenName": ["Lars"]}
7878

79-
ava = filter_on_attributes(ava, required)
79+
ava = filter_on_attributes(ava, required, acs=ac_factory())
8080
assert list(ava.keys()) == ["serialNumber"]
8181
assert ava["serialNumber"] == ["12345"]
8282

@@ -118,7 +118,7 @@ def test_filter_on_attributes_with_missing_required_attribute():
118118
name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
119119
name_format=NAME_FORMAT_URI), ONTS)
120120
with pytest.raises(MissingValue):
121-
filter_on_attributes(ava, required=[eptid])
121+
filter_on_attributes(ava, required=[eptid], acs=ac_factory())
122122

123123

124124
def test_filter_on_attributes_with_missing_optional_attribute():
@@ -127,7 +127,7 @@ def test_filter_on_attributes_with_missing_optional_attribute():
127127
friendly_name="eduPersonTargetedID",
128128
name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10",
129129
name_format=NAME_FORMAT_URI), ONTS)
130-
assert filter_on_attributes(ava, optional=[eptid]) == {}
130+
assert filter_on_attributes(ava, optional=[eptid], acs=ac_factory()) == {}
131131

132132

133133
# ----------------------------------------------------------------------
@@ -432,7 +432,7 @@ def test_filter_values_req_2():
432432
required = [a1, a2]
433433
ava = {"serialNumber": ["12345"], "givenName": ["Lars"]}
434434

435-
raises(MissingValue, filter_on_attributes, ava, required)
435+
raises(MissingValue, filter_on_attributes, ava, required, acs=ac_factory())
436436

437437

438438
def test_filter_values_req_3():
@@ -444,7 +444,7 @@ def test_filter_values_req_3():
444444
required = [a]
445445
ava = {"serialNumber": ["12345"]}
446446

447-
ava = filter_on_attributes(ava, required)
447+
ava = filter_on_attributes(ava, required, acs=ac_factory())
448448
assert list(ava.keys()) == ["serialNumber"]
449449
assert ava["serialNumber"] == ["12345"]
450450

@@ -458,7 +458,7 @@ def test_filter_values_req_4():
458458
required = [a]
459459
ava = {"serialNumber": ["12345"]}
460460

461-
raises(MissingValue, filter_on_attributes, ava, required)
461+
raises(MissingValue, filter_on_attributes, ava, required, acs=ac_factory())
462462

463463

464464
def test_filter_values_req_5():
@@ -470,7 +470,7 @@ def test_filter_values_req_5():
470470
required = [a]
471471
ava = {"serialNumber": ["12345", "54321"]}
472472

473-
ava = filter_on_attributes(ava, required)
473+
ava = filter_on_attributes(ava, required, acs=ac_factory())
474474
assert list(ava.keys()) == ["serialNumber"]
475475
assert ava["serialNumber"] == ["12345"]
476476

@@ -484,7 +484,7 @@ def test_filter_values_req_6():
484484
required = [a]
485485
ava = {"serialNumber": ["12345", "54321"]}
486486

487-
ava = filter_on_attributes(ava, required)
487+
ava = filter_on_attributes(ava, required, acs=ac_factory())
488488
assert list(ava.keys()) == ["serialNumber"]
489489
assert ava["serialNumber"] == ["54321"]
490490

@@ -501,7 +501,7 @@ def test_filter_values_req_opt_0():
501501

502502
ava = {"serialNumber": ["12345", "54321"]}
503503

504-
ava = filter_on_attributes(ava, [r], [o])
504+
ava = filter_on_attributes(ava, [r], [o], acs=ac_factory())
505505
assert list(ava.keys()) == ["serialNumber"]
506506
assert _eq(ava["serialNumber"], ["12345", "54321"])
507507

@@ -519,7 +519,7 @@ def test_filter_values_req_opt_1():
519519

520520
ava = {"serialNumber": ["12345", "54321"]}
521521

522-
ava = filter_on_attributes(ava, [r], [o])
522+
ava = filter_on_attributes(ava, [r], [o], acs=ac_factory())
523523
assert list(ava.keys()) == ["serialNumber"]
524524
assert _eq(ava["serialNumber"], ["12345", "54321"])
525525

@@ -555,7 +555,7 @@ def test_filter_values_req_opt_2():
555555
ava = {"surname": ["Hedberg"], "givenName": ["Roland"],
556556
"eduPersonAffiliation": ["staff"], "uid": ["rohe0002"]}
557557

558-
raises(MissingValue, "filter_on_attributes(ava, r, o)")
558+
raises(MissingValue, "filter_on_attributes(ava, r, o, acs=ac_factory())")
559559

560560

561561
# ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)