floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test_assertion: improve mock_config

This commit is contained in:
Daniel Hahler 2019-10-11 04:18:19 +02:00
parent db6653ce3b
commit fb90259460
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testing/test_assertion.py
View File

@ -12,13 +12,11 @@ from _pytest.assertion import util
from _pytest.compat import ATTRS_EQ_FIELD from _pytest.compat import ATTRS_EQ_FIELD
def mock_config(): def mock_config(verbose=0):
class Config: class Config:
verbose = False
def getoption(self, name): def getoption(self, name):
if name == "verbose": if name == "verbose":
return self.verbose return verbose
raise KeyError("Not mocked out: %s" % name) raise KeyError("Not mocked out: %s" % name)
return Config() return Config()
@ -296,9 +294,8 @@ class TestBinReprIntegration:
result.stdout.fnmatch_lines(["*test_hello*FAIL*", "*test_check*PASS*"]) result.stdout.fnmatch_lines(["*test_hello*FAIL*", "*test_check*PASS*"])
def callequal(left, right, verbose=False): def callequal(left, right, verbose=0):
config = mock_config() config = mock_config(verbose=verbose)
config.verbose = verbose
return plugin.pytest_assertrepr_compare(config, "==", left, right) return plugin.pytest_assertrepr_compare(config, "==", left, right)
@ -322,7 +319,7 @@ class TestAssert_reprcompare:
assert "a" * 50 not in line assert "a" * 50 not in line
def test_text_skipping_verbose(self): def test_text_skipping_verbose(self):
lines = callequal("a" * 50 + "spam", "a" * 50 + "eggs", verbose=True) lines = callequal("a" * 50 + "spam", "a" * 50 + "eggs", verbose=1)
assert "- " + "a" * 50 + "spam" in lines assert "- " + "a" * 50 + "spam" in lines
assert "+ " + "a" * 50 + "eggs" in lines assert "+ " + "a" * 50 + "eggs" in lines
@ -345,7 +342,7 @@ class TestAssert_reprcompare:
def test_bytes_diff_verbose(self): def test_bytes_diff_verbose(self):
"""Check special handling for bytes diff (#5260)""" """Check special handling for bytes diff (#5260)"""
diff = callequal(b"spam", b"eggs", verbose=True) diff = callequal(b"spam", b"eggs", verbose=1)
assert diff == [ assert diff == [
"b'spam' == b'eggs'", "b'spam' == b'eggs'",
"At index 0 diff: b's' != b'e'", "At index 0 diff: b's' != b'e'",
@ -402,9 +399,9 @@ class TestAssert_reprcompare:
When verbose is False, then just a -v notice to get the diff is rendered, When verbose is False, then just a -v notice to get the diff is rendered,
when verbose is True, then ndiff of the pprint is returned. when verbose is True, then ndiff of the pprint is returned.
""" """
expl = callequal(left, right, verbose=False) expl = callequal(left, right, verbose=0)
assert expl[-1] == "Use -v to get the full diff" assert expl[-1] == "Use -v to get the full diff"
expl = "\n".join(callequal(left, right, verbose=True)) expl = "\n".join(callequal(left, right, verbose=1))
assert expl.endswith(textwrap.dedent(expected).strip()) assert expl.endswith(textwrap.dedent(expected).strip())
def test_list_different_lengths(self): def test_list_different_lengths(self):