Skip to content

Commit 7cc1361

Browse files
removed xfail markers
1 parent 5dc2950 commit 7cc1361

File tree

1 file changed

+15
-30
lines changed

1 file changed

+15
-30
lines changed

tests/test_nash.py

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -418,23 +418,20 @@ def test_lcp_behavior_double():
418418
games.create_2x2_zero_sum_efg(),
419419
[[["1/2", "1/2"]], [["1/2", "1/2"]]]
420420
),
421-
pytest.param(
421+
(
422422
games.create_2x2_zero_sum_efg(missing_term_outcome=True),
423423
[[["1/2", "1/2"]], [["1/2", "1/2"]]],
424-
marks=pytest.mark.xfail(reason="Problem with missing terminal outcomes")
425424
),
426425
(games.create_matching_pennies_efg(),
427426
[[["1/2", "1/2"]], [["1/2", "1/2"]]]),
428-
pytest.param(
427+
(
429428
games.create_matching_pennies_efg(with_neutral_outcome=True),
430429
[[["1/2", "1/2"]], [["1/2", "1/2"]]],
431-
marks=pytest.mark.xfail(reason="Problem with missing outcomes")
432430
),
433431
(games.create_stripped_down_poker_efg(), [[[1, 0], ["1/3", "2/3"]], [["2/3", "1/3"]]]),
434-
pytest.param(
432+
(
435433
games.create_stripped_down_poker_efg(nonterm_outcomes=True),
436434
[[[1, 0], ["1/3", "2/3"]], [["2/3", "1/3"]]],
437-
marks=pytest.mark.xfail(reason="Problem with internal outcomes")
438435
),
439436
(
440437
games.create_kuhn_poker_efg(),
@@ -450,7 +447,7 @@ def test_lcp_behavior_double():
450447
[[1, 0], ["2/3", "1/3"], [0, 1], [0, 1], ["2/3", "1/3"], [1, 0]],
451448
],
452449
),
453-
pytest.param(
450+
(
454451
games.create_kuhn_poker_efg(nonterm_outcomes=True),
455452
[
456453
[
@@ -463,7 +460,6 @@ def test_lcp_behavior_double():
463460
],
464461
[[1, 0], ["2/3", "1/3"], [0, 1], [0, 1], ["2/3", "1/3"], [1, 0]],
465462
],
466-
marks=pytest.mark.xfail(reason="Problem with internal outcomes")
467463
),
468464
# In the next test case:
469465
# 1/2-1/2 for l/r is determined by MixedBehaviorProfile.UndefinedToCentroid()
@@ -490,13 +486,12 @@ def test_lcp_behavior_double():
490486
[["2/3", "1/3"], ["1/3", "2/3"], ["1/3", "2/3"]],
491487
]
492488
),
493-
pytest.param(
489+
(
494490
games.create_three_action_internal_outcomes_efg(nonterm_outcomes=True),
495491
[
496492
[["1/3", 0, "2/3"], ["2/3", 0, "1/3"]],
497493
[["2/3", "1/3"], ["1/3", "2/3"], ["1/3", "2/3"]],
498494
],
499-
marks=pytest.mark.xfail(reason="Problem with internal outcomes")
500495
),
501496
(
502497
games.create_large_payoff_game_efg(),
@@ -513,13 +508,12 @@ def test_lcp_behavior_double():
513508
[[1, 0], ["6/11", "5/11"]]
514509
]
515510
),
516-
pytest.param(
511+
(
517512
games.create_chance_in_middle_efg(nonterm_outcomes=True),
518513
[
519514
[["3/11", "8/11"], [1, 0], [1, 0], [1, 0], [1, 0]],
520515
[[1, 0], ["6/11", "5/11"]]
521516
],
522-
marks=pytest.mark.xfail(reason="Problem with internal outcomes")
523517
),
524518
# Non-zero-sum games
525519
(
@@ -542,19 +536,17 @@ def test_lcp_behavior_double():
542536
games.create_entry_accomodation_efg(),
543537
[[["2/3", "1/3"], [1, 0], [1, 0]], [["2/3", "1/3"]]]
544538
),
545-
pytest.param(
539+
(
546540
games.create_entry_accomodation_efg(nonterm_outcomes=True),
547541
[[["2/3", "1/3"], [1, 0], [1, 0]], [["2/3", "1/3"]]],
548-
marks=pytest.mark.xfail(reason="Problem with internal outcomes")
549542
),
550543
(
551544
games.create_non_zero_sum_lacking_outcome_efg(),
552545
[[["1/3", "2/3"]], [["1/2", "1/2"]]]
553546
),
554-
pytest.param(
547+
(
555548
games.create_non_zero_sum_lacking_outcome_efg(missing_term_outcome=True),
556549
[[["1/3", "2/3"]], [["1/2", "1/2"]]],
557-
marks=pytest.mark.xfail(reason="Problem with missing terminal outcome")
558550
),
559551
],
560552
)
@@ -632,35 +624,31 @@ def test_lp_behavior_double():
632624
games.create_two_player_perfect_info_win_lose_efg(),
633625
[[[0, 1], [1, 0]], [[1, 0], [1, 0]]],
634626
),
635-
pytest.param(
627+
(
636628
games.create_two_player_perfect_info_win_lose_efg(nonterm_outcomes=True),
637629
[[[0, 1], [1, 0]], [[1, 0], [1, 0]]],
638-
marks=pytest.mark.xfail(reason="Problem with non-terminal outcomes")
639630
),
640631
(
641632
games.create_2x2_zero_sum_efg(missing_term_outcome=False),
642633
[[["1/2", "1/2"]], [["1/2", "1/2"]]]
643634
),
644-
pytest.param(
635+
(
645636
games.create_2x2_zero_sum_efg(missing_term_outcome=True),
646637
[[["1/2", "1/2"]], [["1/2", "1/2"]]],
647-
marks=pytest.mark.xfail(reason="Problem with missing terminal outcome")
648638
),
649639
(games.create_matching_pennies_efg(with_neutral_outcome=False),
650640
[[["1/2", "1/2"]], [["1/2", "1/2"]]]),
651-
pytest.param(
641+
(
652642
games.create_matching_pennies_efg(with_neutral_outcome=True),
653643
[[["1/2", "1/2"]], [["1/2", "1/2"]]],
654-
marks=pytest.mark.xfail(reason="Problem with outcomes")
655644
),
656645
(
657646
games.create_stripped_down_poker_efg(),
658647
[[[1, 0], ["1/3", "2/3"]], [["2/3", "1/3"]]],
659648
),
660-
pytest.param(
649+
(
661650
games.create_stripped_down_poker_efg(nonterm_outcomes=True),
662651
[[[1, 0], ["1/3", "2/3"]], [["2/3", "1/3"]]],
663-
marks=pytest.mark.xfail(reason="Problem with non-terminal outcomes")
664652
),
665653
(
666654
games.create_kuhn_poker_efg(),
@@ -669,7 +657,7 @@ def test_lp_behavior_double():
669657
[[1, 0], ["2/3", "1/3"], [0, 1], [0, 1], ["2/3", "1/3"], [1, 0]],
670658
],
671659
),
672-
pytest.param(
660+
(
673661
games.create_kuhn_poker_efg(nonterm_outcomes=True),
674662
[
675663
[
@@ -682,7 +670,6 @@ def test_lp_behavior_double():
682670
],
683671
[[1, 0], ["2/3", "1/3"], [0, 1], [0, 1], ["2/3", "1/3"], [1, 0]],
684672
],
685-
marks=pytest.mark.xfail(reason="Problem with non-terminal outcomes")
686673
),
687674
(
688675
games.create_seq_form_STOC_paper_zero_sum_2_player_efg(),
@@ -702,13 +689,12 @@ def test_lp_behavior_double():
702689
[["2/3", "1/3"], ["2/3", "1/3"], ["1/3", "2/3"]],
703690
]
704691
),
705-
pytest.param(
692+
(
706693
games.create_three_action_internal_outcomes_efg(nonterm_outcomes=True),
707694
[
708695
[["1/3", 0, "2/3"], ["2/3", 0, "1/3"]],
709696
[["2/3", "1/3"], ["2/3", "1/3"], ["1/3", "2/3"]],
710697
],
711-
marks=pytest.mark.xfail(reason="Problem with internal and missing outcomes")
712698
),
713699
(
714700
games.create_large_payoff_game_efg(),
@@ -725,13 +711,12 @@ def test_lp_behavior_double():
725711
[[1, 0], ["6/11", "5/11"]]
726712
],
727713
),
728-
pytest.param(
714+
(
729715
games.create_chance_in_middle_efg(nonterm_outcomes=True),
730716
[
731717
[["3/11", "8/11"], [1, 0], [1, 0], [1, 0], [1, 0]],
732718
[[1, 0], ["6/11", "5/11"]]
733719
],
734-
marks=pytest.mark.xfail(reason="Problem with internal outcomes")
735720
),
736721
],
737722
)

0 commit comments

Comments
 (0)