McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Make assertions independent of log prefixes

This commit is contained in:
Nguyễn Gia Phong 2020-08-01 16:57:30 +07:00
parent 9add5aa923
commit 0ef877339a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
news/2581396b-ebe4-46a9-b38f-e6b0da97d53a.trivial Normal file
View File

20
tests/functional/test_install_check.py
View File

@ -1,8 +1,10 @@
from tests.lib import create_test_package_with_setup
def contains_expected_lines(string, expected_lines):
return set(expected_lines) <= set(string.splitlines())
def assert_contains_expected_lines(string, expected_lines):
lines = string.splitlines()
for expected_line in expected_lines:
assert any(line.endswith(expected_line) for line in lines)
def test_check_install_canonicalization(script):
@ -38,7 +40,7 @@ def test_check_install_canonicalization(script):
"pkga 1.0 requires SPECIAL.missing, which is not installed.",
]
# Deprecated python versions produce an extra warning on stderr
assert contains_expected_lines(result.stderr, expected_lines)
assert_contains_expected_lines(result.stderr, expected_lines)
assert result.returncode == 0
# Install the second missing package and expect that there is no warning
@ -55,7 +57,7 @@ def test_check_install_canonicalization(script):
expected_lines = [
"No broken requirements found.",
]
assert contains_expected_lines(result.stdout, expected_lines)
assert_contains_expected_lines(result.stdout, expected_lines)
assert result.returncode == 0
@ -85,12 +87,10 @@ def test_check_install_does_not_warn_for_out_of_graph_issues(script):
result = script.pip(
'install', '--no-index', pkg_conflict_path, allow_stderr_error=True,
)
assert contains_expected_lines(result.stderr, [
assert_contains_expected_lines(result.stderr, [
"broken 1.0 requires missing, which is not installed.",
(
"broken 1.0 requires conflict<1.0, but "
"you'll have conflict 1.0 which is incompatible."
),
"broken 1.0 requires conflict<1.0, "
"but you'll have conflict 1.0 which is incompatible."
])
# Install unrelated package
@ -105,4 +105,4 @@ def test_check_install_does_not_warn_for_out_of_graph_issues(script):
"broken 1.0 requires missing, which is not installed.",
"broken 1.0 has requirement conflict<1.0, but you have conflict 1.0.",
]
assert contains_expected_lines(result.stdout, expected_lines)
assert_contains_expected_lines(result.stdout, expected_lines)