Skip to content

Revert "xfail test_pip_wheel_ext_module_with_tmpdir_inside" #12109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2023
Merged

Revert "xfail test_pip_wheel_ext_module_with_tmpdir_inside" #12109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
108c055
Revert "xfail test_pip_wheel_ext_module_with_tmpdir_inside"
sbidoul Jun 27, 2023
fab8cf7
Remove Unused "type: ignore" comments
sbidoul Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions tests/functional/test_wheel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,6 @@ def test_pip_wheel_with_user_set_in_config(
sys.platform.startswith("win"),
reason="The empty extension module does not work on Win",
)
@pytest.mark.xfail(
condition=sys.platform == "darwin" and sys.version_info < (3, 9),
reason=(
"Unexplained 'no module named platform' in "
"https://github.com/pypa/wheel/blob"
"/c87e6ed82b58b41b258a3e8c852af8bc1817bb00"
"/src/wheel/vendored/packaging/tags.py#L396-L411"
),
)
def test_pip_wheel_ext_module_with_tmpdir_inside(
script: PipTestEnvironment, data: TestData, common_wheels: Path
) -> None:
Expand Down
14 changes: 7 additions & 7 deletions tests/unit/test_network_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def test_keyring_get_password(
expect: Tuple[Optional[str], Optional[str]],
) -> None:
keyring = KeyringModuleV1()
monkeypatch.setitem(sys.modules, "keyring", keyring) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", keyring)
auth = MultiDomainBasicAuth(
index_urls=["http://example.com/path2", "http://example.com/path3"],
keyring_provider="import",
Expand All @@ -205,7 +205,7 @@ def test_keyring_get_password(

def test_keyring_get_password_after_prompt(monkeypatch: pytest.MonkeyPatch) -> None:
keyring = KeyringModuleV1()
monkeypatch.setitem(sys.modules, "keyring", keyring) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", keyring)
auth = MultiDomainBasicAuth(keyring_provider="import")

def ask_input(prompt: str) -> str:
Expand All @@ -221,7 +221,7 @@ def test_keyring_get_password_after_prompt_when_none(
monkeypatch: pytest.MonkeyPatch,
) -> None:
keyring = KeyringModuleV1()
monkeypatch.setitem(sys.modules, "keyring", keyring) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", keyring)
auth = MultiDomainBasicAuth(keyring_provider="import")

def ask_input(prompt: str) -> str:
Expand All @@ -242,7 +242,7 @@ def test_keyring_get_password_username_in_index(
monkeypatch: pytest.MonkeyPatch,
) -> None:
keyring = KeyringModuleV1()
monkeypatch.setitem(sys.modules, "keyring", keyring) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", keyring)
auth = MultiDomainBasicAuth(
index_urls=["http://[email protected]/path2", "http://example.com/path4"],
keyring_provider="import",
Expand Down Expand Up @@ -278,7 +278,7 @@ def test_keyring_set_password(
expect_save: bool,
) -> None:
keyring = KeyringModuleV1()
monkeypatch.setitem(sys.modules, "keyring", keyring) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", keyring)
auth = MultiDomainBasicAuth(prompting=True, keyring_provider="import")
monkeypatch.setattr(auth, "_get_url_and_credentials", lambda u: (u, None, None))
monkeypatch.setattr(auth, "_prompt_for_password", lambda *a: creds)
Expand Down Expand Up @@ -354,7 +354,7 @@ def get_credential(self, system: str, username: str) -> Optional[Credential]:
def test_keyring_get_credential(
monkeypatch: pytest.MonkeyPatch, url: str, expect: str
) -> None:
monkeypatch.setitem(sys.modules, "keyring", KeyringModuleV2()) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", KeyringModuleV2())
auth = MultiDomainBasicAuth(
index_urls=["http://example.com/path1", "http://example.com/path2"],
keyring_provider="import",
Expand All @@ -378,7 +378,7 @@ def get_credential(self, system: str, username: str) -> None:

def test_broken_keyring_disables_keyring(monkeypatch: pytest.MonkeyPatch) -> None:
keyring_broken = KeyringModuleBroken()
monkeypatch.setitem(sys.modules, "keyring", keyring_broken) # type: ignore[misc]
monkeypatch.setitem(sys.modules, "keyring", keyring_broken)

auth = MultiDomainBasicAuth(
index_urls=["http://example.com/"], keyring_provider="import"
Expand Down