From 16a07f5964dc00146e440c9361a2d383fe761d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Randy=20D=C3=B6ring?= <30527984+radoering@users.noreply.github.com> Date: Thu, 3 Feb 2022 20:00:02 +0100 Subject: [PATCH] Prefer actual-expected to expected-actual in assertions (#277) --- tests/packages/test_dependency.py | 4 ++-- tests/packages/test_url_dependency.py | 4 ++-- tests/packages/test_vcs_dependency.py | 12 ++++++------ tests/test_factory.py | 2 +- tests/version/test_markers.py | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/packages/test_dependency.py b/tests/packages/test_dependency.py index 4165f2af6..a0b4beb5c 100644 --- a/tests/packages/test_dependency.py +++ b/tests/packages/test_dependency.py @@ -174,8 +174,8 @@ def test_to_pep_508_with_patch_python_version(python_versions: str, marker: str) expected = f"Django (>=1.23,<2.0); {marker}" - assert expected == dependency.to_pep_508() - assert marker == str(dependency.marker) + assert dependency.to_pep_508() == expected + assert str(dependency.marker) == marker def test_to_pep_508_tilde(): diff --git a/tests/packages/test_url_dependency.py b/tests/packages/test_url_dependency.py index c86ced818..71b43f5e0 100644 --- a/tests/packages/test_url_dependency.py +++ b/tests/packages/test_url_dependency.py @@ -12,7 +12,7 @@ def test_to_pep_508(): "pytorch @" " https://download.pytorch.org/whl/cpu/torch-1.5.1%2Bcpu-cp38-cp38-linux_x86_64.whl" ) - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected def test_to_pep_508_with_marker(): @@ -27,4 +27,4 @@ def test_to_pep_508_with_marker(): " https://download.pytorch.org/whl/cpu/torch-1.5.1%2Bcpu-cp38-cp38-linux_x86_64.whl" ' ; sys_platform == "linux"' ) - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected diff --git a/tests/packages/test_vcs_dependency.py b/tests/packages/test_vcs_dependency.py index 764f741f1..9c494f667 100644 --- a/tests/packages/test_vcs_dependency.py +++ b/tests/packages/test_vcs_dependency.py @@ -12,7 +12,7 @@ def test_to_pep_508(): expected = "poetry @ git+https://github.com/python-poetry/poetry.git" - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected def test_to_pep_508_ssh(): @@ -20,7 +20,7 @@ def test_to_pep_508_ssh(): expected = "poetry @ git+ssh://git@github.com/sdispater/poetry.git" - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected def test_to_pep_508_with_extras(): @@ -30,7 +30,7 @@ def test_to_pep_508_with_extras(): expected = "poetry[foo] @ git+https://github.com/python-poetry/poetry.git" - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected def test_to_pep_508_in_extras(): @@ -42,7 +42,7 @@ def test_to_pep_508_in_extras(): expected = ( 'poetry @ git+https://github.com/python-poetry/poetry.git ; extra == "foo"' ) - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected dependency = VCSDependency( "poetry", "git", "https://github.com/python-poetry/poetry.git", extras=["bar"] @@ -53,7 +53,7 @@ def test_to_pep_508_in_extras(): 'poetry[bar] @ git+https://github.com/python-poetry/poetry.git ; extra == "foo"' ) - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected dependency = VCSDependency( "poetry", "git", "https://github.com/python-poetry/poetry.git", "b;ar;" @@ -65,7 +65,7 @@ def test_to_pep_508_in_extras(): ' "foo;"' ) - assert expected == dependency.to_pep_508() + assert dependency.to_pep_508() == expected @pytest.mark.parametrize("groups", [["main"], ["dev"]]) diff --git a/tests/test_factory.py b/tests/test_factory.py index 74bd61ba4..04dddb687 100644 --- a/tests/test_factory.py +++ b/tests/test_factory.py @@ -214,7 +214,7 @@ def test_create_poetry_fails_on_invalid_configuration(): The Poetry configuration is invalid: - 'description' is a required property """ - assert expected == str(e.value) + assert str(e.value) == expected def test_create_poetry_omits_dev_dependencies_iff_with_dev_is_false(): diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py index 408501284..123206e4e 100644 --- a/tests/version/test_markers.py +++ b/tests/version/test_markers.py @@ -432,7 +432,7 @@ def test_marker_union_intersect_marker_union_drops_unnecessary_markers(): 'python_version >= "2.7" and python_version < "2.8" ' 'or python_version >= "3.4" and python_version < "4.0"' ) - assert expected == str(intersection) + assert str(intersection) == expected def test_marker_union_intersect_multi_marker(): @@ -669,7 +669,7 @@ def test_parse_version_like_markers(marker: str, env: Dict[str, str]): def test_without_extras(marker: str, expected: str): m = parse_marker(marker) - assert expected == str(m.without_extras()) + assert str(m.without_extras()) == expected @pytest.mark.parametrize( @@ -713,7 +713,7 @@ def test_exclude(marker: str, excluded: str, expected: str): if expected == "*": assert m.exclude(excluded).is_any() else: - assert expected == str(m.exclude(excluded)) + assert str(m.exclude(excluded)) == expected @pytest.mark.parametrize( @@ -759,7 +759,7 @@ def test_exclude(marker: str, excluded: str, expected: str): def test_only(marker: str, only: List[str], expected: str): m = parse_marker(marker) - assert expected == str(m.only(*only)) + assert str(m.only(*only)) == expected def test_union_of_a_single_marker_is_the_single_marker():