12
12
from _pytest .compat import ATTRS_EQ_FIELD
13
13
14
14
15
- def mock_config ():
15
+ def mock_config (verbose = 0 ):
16
16
class Config :
17
- verbose = False
18
-
19
17
def getoption (self , name ):
20
18
if name == "verbose" :
21
- return self . verbose
19
+ return verbose
22
20
raise KeyError ("Not mocked out: %s" % name )
23
21
24
22
return Config ()
@@ -296,9 +294,8 @@ def test_check(list):
296
294
result .stdout .fnmatch_lines (["*test_hello*FAIL*" , "*test_check*PASS*" ])
297
295
298
296
299
- def callequal (left , right , verbose = False ):
300
- config = mock_config ()
301
- config .verbose = verbose
297
+ def callequal (left , right , verbose = 0 ):
298
+ config = mock_config (verbose = verbose )
302
299
return plugin .pytest_assertrepr_compare (config , "==" , left , right )
303
300
304
301
@@ -322,7 +319,7 @@ def test_text_skipping(self):
322
319
assert "a" * 50 not in line
323
320
324
321
def test_text_skipping_verbose (self ):
325
- lines = callequal ("a" * 50 + "spam" , "a" * 50 + "eggs" , verbose = True )
322
+ lines = callequal ("a" * 50 + "spam" , "a" * 50 + "eggs" , verbose = 1 )
326
323
assert "- " + "a" * 50 + "spam" in lines
327
324
assert "+ " + "a" * 50 + "eggs" in lines
328
325
@@ -345,7 +342,7 @@ def test_bytes_diff_normal(self):
345
342
346
343
def test_bytes_diff_verbose (self ):
347
344
"""Check special handling for bytes diff (#5260)"""
348
- diff = callequal (b"spam" , b"eggs" , verbose = True )
345
+ diff = callequal (b"spam" , b"eggs" , verbose = 1 )
349
346
assert diff == [
350
347
"b'spam' == b'eggs'" ,
351
348
"At index 0 diff: b's' != b'e'" ,
@@ -402,9 +399,9 @@ def test_iterable_full_diff(self, left, right, expected):
402
399
When verbose is False, then just a -v notice to get the diff is rendered,
403
400
when verbose is True, then ndiff of the pprint is returned.
404
401
"""
405
- expl = callequal (left , right , verbose = False )
402
+ expl = callequal (left , right , verbose = 0 )
406
403
assert expl [- 1 ] == "Use -v to get the full diff"
407
- expl = "\n " .join (callequal (left , right , verbose = True ))
404
+ expl = "\n " .join (callequal (left , right , verbose = 1 ))
408
405
assert expl .endswith (textwrap .dedent (expected ).strip ())
409
406
410
407
def test_list_different_lengths (self ):
0 commit comments