Manual fixes of PT018

Author: notatallshaw

tests/functional/test_install.py

@@ -105,16 +105,13 @@ def test_pep518_refuses_conflicting_requires(
     result = script.pip_install_local(
         "-f", script.scratch_path, project_dir, expect_error=True
     )
+    assert result.returncode != 0
     assert (
-        result.returncode != 0
-        and (
             f"Some build dependencies for {project_dir.as_uri()} conflict "
             "with PEP 517/518 supported "
             "requirements: setuptools==1.0 is incompatible with "
             "setuptools>=40.8.0."
-        )
-        in result.stderr
-    ), str(result)
+        ) in result.stderr, str(result)
 
 
 def test_pep518_refuses_invalid_requires(
@@ -2309,10 +2306,8 @@ def test_error_all_yanked_files_and_no_pin(
         expect_error=True,
     )
     # Make sure an error is raised
-    assert (
-        result.returncode == 1
-        and "ERROR: No matching distribution found for simple\n" in result.stderr
-    ), str(result)
+    assert result.returncode == 1
+    assert "ERROR: No matching distribution found for simple\n" in result.stderr, str(result)
 
 
 @pytest.mark.parametrize(

tests/functional/test_pep517.py

@@ -164,7 +164,8 @@ def test_conflicting_pep517_backend_requirements(
         "dependencies: simplewheel==1.0 is incompatible with "
         "simplewheel==2.0."
     )
-    assert result.returncode != 0 and msg in result.stderr, str(result)
+    assert result.returncode != 0
+    assert msg in result.stderr, str(result)
 
 
 def test_no_check_build_deps(
@@ -209,7 +210,8 @@ def test_validate_missing_pep517_backend_requirements(
         f"Some build dependencies for {project_dir.as_uri()} are missing: "
         "'simplewheel==1.0', 'test_backend'."
     )
-    assert result.returncode != 0 and msg in result.stderr, str(result)
+    assert result.returncode != 0
+    assert msg in result.stderr, str(result)
 
 
 def test_validate_conflicting_pep517_backend_requirements(
@@ -236,7 +238,8 @@ def test_validate_conflicting_pep517_backend_requirements(
         "dependencies: simplewheel==2.0 is incompatible with "
         "simplewheel==1.0."
     )
-    assert result.returncode != 0 and msg in result.stderr, str(result)
+    assert result.returncode != 0
+    assert msg in result.stderr, str(result)
 
 
 def test_pep517_backend_requirements_satisfied_by_prerelease(

tests/unit/test_collector.py

@@ -880,11 +880,9 @@ def test_collect_sources__file_expand_dir(data: TestData) -> None:
         project_name="",
         candidates_from_page=None,  # type: ignore[arg-type]
     )
-    assert (
-        not sources.index_urls
-        and len(sources.find_links) == 1
-        and isinstance(sources.find_links[0], _FlatDirectorySource)
-    ), (
+    assert not sources.index_urls
+    assert len(sources.find_links) == 1
+    assert isinstance(sources.find_links[0], _FlatDirectorySource), (
         "Directory source should have been found "
         f"at find-links url: {data.find_links}"
     )
@@ -909,11 +907,9 @@ def test_collect_sources__file_not_find_link(data: TestData) -> None:
         # Shouldn't be used.
         candidates_from_page=None,  # type: ignore[arg-type]
     )
-    assert (
-        not sources.find_links
-        and len(sources.index_urls) == 1
-        and isinstance(sources.index_urls[0], _IndexDirectorySource)
-    ), "Directory specified as index should be treated as a page"
+    assert not sources.find_links
+    assert len(sources.index_urls) == 1
+    assert isinstance(sources.index_urls[0], _IndexDirectorySource), "Directory specified as index should be treated as a page"
 
 
 def test_collect_sources__non_existing_path() -> None:
@@ -934,9 +930,8 @@ def test_collect_sources__non_existing_path() -> None:
         project_name=None,  # type: ignore[arg-type]
         candidates_from_page=None,  # type: ignore[arg-type]
     )
-    assert not sources.index_urls and sources.find_links == [
-        None
-    ], "Nothing should have been found"
+    assert not sources.index_urls
+    assert sources.find_links == [None], "Nothing should have been found"
 
 
 def check_links_include(links: List[Link], names: List[str]) -> None: