@@ -111,13 +111,12 @@ def test(check_first):
111
111
result .stdout .fnmatch_lines ([expected ])
112
112
113
113
def test_rewrite_assertions_pytester_plugin (
114
- self , pytester : Pytester , monkeypatch : MonkeyPatch
114
+ self , pytester : Pytester , remove_ci_env_var
115
115
) -> None :
116
116
"""
117
117
Assertions in the pytester plugin must also benefit from assertion
118
118
rewriting (#1920).
119
119
"""
120
- monkeypatch .delenv ("CI" )
121
120
pytester .makepyfile (
122
121
"""
123
122
pytest_plugins = ['pytester']
@@ -455,9 +454,8 @@ def test_multiline_text_diff(self) -> None:
455
454
assert "- eggs" in diff
456
455
assert "+ spam" in diff
457
456
458
- def test_bytes_diff_normal (self , monkeypatch : MonkeyPatch ) -> None :
457
+ def test_bytes_diff_normal (self , remove_ci_env_var ) -> None :
459
458
"""Check special handling for bytes diff (#5260)"""
460
- monkeypatch .delenv ("CI" )
461
459
diff = callequal (b"spam" , b"eggs" )
462
460
463
461
assert diff == [
@@ -534,24 +532,20 @@ def test_list(self) -> None:
534
532
),
535
533
],
536
534
)
537
- def test_iterable_full_diff (
538
- self , left , right , expected , monkeypatch : MonkeyPatch
539
- ) -> None :
535
+ def test_iterable_full_diff (self , left , right , expected , remove_ci_env_var ) -> None :
540
536
"""Test the full diff assertion failure explanation.
541
537
542
538
When verbose is False, then just a -v notice to get the diff is rendered,
543
539
when verbose is True, then ndiff of the pprint is returned.
544
540
"""
545
- monkeypatch .delenv ("CI" )
546
541
expl = callequal (left , right , verbose = 0 )
547
542
assert expl is not None
548
543
assert expl [- 1 ] == "Use -v to get more diff"
549
544
verbose_expl = callequal (left , right , verbose = 1 )
550
545
assert verbose_expl is not None
551
546
assert "\n " .join (verbose_expl ).endswith (textwrap .dedent (expected ).strip ())
552
547
553
- def test_iterable_quiet (self , monkeypatch : MonkeyPatch ) -> None :
554
- monkeypatch .delenv ("CI" )
548
+ def test_iterable_quiet (self , remove_ci_env_var ) -> None :
555
549
expl = callequal ([1 , 2 ], [10 , 2 ], verbose = - 1 )
556
550
assert expl == [
557
551
"[1, 2] == [10, 2]" ,
@@ -721,8 +715,7 @@ def test_dict(self) -> None:
721
715
assert expl is not None
722
716
assert len (expl ) > 1
723
717
724
- def test_dict_omitting (self , monkeypatch : MonkeyPatch ) -> None :
725
- monkeypatch .delenv ("CI" )
718
+ def test_dict_omitting (self , remove_ci_env_var ) -> None :
726
719
lines = callequal ({"a" : 0 , "b" : 1 }, {"a" : 1 , "b" : 1 })
727
720
assert lines is not None
728
721
assert lines [2 ].startswith ("Omitting 1 identical item" )
@@ -990,10 +983,7 @@ def test_dataclasses(self, pytester: Pytester) -> None:
990
983
consecutive = True ,
991
984
)
992
985
993
- def test_recursive_dataclasses (
994
- self , pytester : Pytester , monkeypatch : MonkeyPatch
995
- ) -> None :
996
- monkeypatch .delenv ("CI" )
986
+ def test_recursive_dataclasses (self , pytester : Pytester , remove_ci_env_var ) -> None :
997
987
p = pytester .copy_example ("dataclasses/test_compare_recursive_dataclasses.py" )
998
988
result = pytester .runpytest (p )
999
989
result .assert_outcomes (failed = 1 , passed = 0 )
@@ -1225,9 +1215,7 @@ def __eq__(self, other): # pragma: no cover
1225
1215
1226
1216
1227
1217
class TestAssert_reprcompare_namedtuple :
1228
- def test_namedtuple (self , monkeypatch : MonkeyPatch ) -> None :
1229
- monkeypatch .delenv ("CI" )
1230
-
1218
+ def test_namedtuple (self , remove_ci_env_var ) -> None :
1231
1219
class NT (NamedTuple ):
1232
1220
a : Any
1233
1221
b : Any
@@ -1250,9 +1238,7 @@ class NT(NamedTuple):
1250
1238
"Use -v to get more diff" ,
1251
1239
]
1252
1240
1253
- def test_comparing_two_different_namedtuple (self , monkeypatch : MonkeyPatch ) -> None :
1254
- monkeypatch .delenv ("CI" )
1255
-
1241
+ def test_comparing_two_different_namedtuple (self , remove_ci_env_var ) -> None :
1256
1242
class NT1 (NamedTuple ):
1257
1243
a : Any
1258
1244
b : Any
0 commit comments