b4e0594901
Repository-wide mechanical cleanup so `ruff check src tests` has a chance of passing; no behavioural changes. - Add `from __future__ import annotations` where PEP 604 unions are used. This has to come first: pyproject declares requires-python >= 3.9, where `X | None` is not evaluable at runtime unless annotations are stringified. - Replace typing.List/Dict/Tuple/Set with the builtin generics and Optional[X] with X | None, then drop the imports that became unused. The four actions/*/__init__.py files needed this by hand because ruff leaves unused imports in __init__.py alone (possible re-exports). - Strip shebangs from 72 importable modules. None of them are executable or invoked directly; the entry points are console_scripts and runpy. - Flatten nested `with` blocks, collapse needless-bool returns, and apply the remaining mechanical ruff fixes (PIE810, FLY002, PERF102, FURB192, RUF059, I001). - Pass check=False explicitly to the four subprocess.run() calls that inspect returncode themselves. That is the existing default. Two rewrites are visible to mocks, so their tests move with them: subprocess.run(stdout=PIPE, stderr=PIPE) became capture_output=True, and open(path, "r", ...) lost the redundant mode. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
86 lines
3.1 KiB
Python
86 lines
3.1 KiB
Python
from __future__ import annotations
|
|
|
|
import unittest
|
|
from unittest.mock import patch
|
|
|
|
from pkgmgr.core.credentials.resolver import TokenResolver
|
|
from pkgmgr.core.credentials.types import TokenResult
|
|
|
|
|
|
class TestTokenResolverIntegration(unittest.TestCase):
|
|
def test_full_resolution_flow_with_invalid_gh_and_keyring_then_prompt(self) -> None:
|
|
"""
|
|
Full integration scenario:
|
|
|
|
- ENV provides nothing
|
|
- GitHub CLI (gh) is available and returns a token, but it is INVALID
|
|
- Keyring contains a token, but it is INVALID
|
|
- Interactive prompt provides a NEW token
|
|
- New token is ACCEPTED and OVERWRITES the keyring entry
|
|
"""
|
|
|
|
resolver = TokenResolver()
|
|
|
|
def validate_side_effect(
|
|
provider_kind: str,
|
|
host: str,
|
|
token: str,
|
|
) -> bool:
|
|
return False # gh + keyring invalid
|
|
|
|
with (
|
|
patch.dict("os.environ", {}, clear=True),
|
|
patch(
|
|
"pkgmgr.core.credentials.providers.gh.shutil.which",
|
|
return_value="/usr/bin/gh",
|
|
),
|
|
patch(
|
|
"pkgmgr.core.credentials.providers.gh.subprocess.check_output",
|
|
return_value="gh-invalid-token\n",
|
|
),
|
|
patch(
|
|
"pkgmgr.core.credentials.providers.keyring._import_keyring"
|
|
) as mock_import_keyring,
|
|
patch(
|
|
"pkgmgr.core.credentials.providers.prompt.sys.stdin.isatty",
|
|
return_value=True,
|
|
),
|
|
patch(
|
|
"pkgmgr.core.credentials.providers.prompt.getpass",
|
|
return_value="new-valid-token",
|
|
),
|
|
patch(
|
|
"pkgmgr.core.credentials.resolver.validate_token",
|
|
side_effect=validate_side_effect,
|
|
) as validate_mock,
|
|
):
|
|
mock_keyring = mock_import_keyring.return_value
|
|
mock_keyring.get_password.return_value = "keyring-invalid-token"
|
|
|
|
result = resolver.get_token(
|
|
provider_kind="github",
|
|
host="github.com",
|
|
)
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Assertions
|
|
# ----------------------------------------------------------------------
|
|
self.assertIsInstance(result, TokenResult)
|
|
self.assertEqual(result.token, "new-valid-token")
|
|
self.assertEqual(result.source, "prompt")
|
|
|
|
# validate_token was called ONLY for gh and keyring
|
|
validated_tokens = [call.args[2] for call in validate_mock.call_args_list]
|
|
self.assertIn("gh-invalid-token", validated_tokens)
|
|
self.assertIn("keyring-invalid-token", validated_tokens)
|
|
self.assertNotIn("new-valid-token", validated_tokens)
|
|
|
|
# Keyring must be overwritten with the new token
|
|
mock_keyring.set_password.assert_called_once()
|
|
_service, _username, stored_token = mock_keyring.set_password.call_args.args
|
|
self.assertEqual(stored_token, "new-valid-token")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|