Repository navigation
fix(config): honor ANDROID_ADB_SERVER_PORT as an ADB port fallback - #146
Open
xianjianlf2 wants to merge 2 commits into
Open
xianjianlf2 wants to merge 2 commits into
xianjianlf2 wants to merge 2 commits into
Conversation
Synchronize with upstream 351ca84. The 24 ADB-focused tests pass; full-suite failures match the pristine upstream baseline. AI-assisted with OpenAI Codex.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When an ADB server is listening on the port selected by
ANDROID_ADB_SERVER_PORT, Artemis falls back to 5037 and cannot see the same devices asadb(reported in #122).Accept
ANDROID_ADB_SERVER_PORTas a validation alias forSettings.ADB_PORT. An explicitly configuredADB_PORTstill wins; the default remains 5037. ExistingADB_SERVER_SOCKETselection is unchanged. The environment template documents the fallback.The seven added regression cases cover default and explicit ports, constructor overrides, socket precedence, and startup synchronization into settings, subprocess environment, and ADB command arguments.
Fixes #122.
Synced with upstream main
351ca842ina68b638on 2026-10-30, including the third-party code reorganization. The PR still changes only four files relative to that upstream revision.Validation on macOS / Python 3.12 with frozen dependencies:
pytest tests/unit/core/test_adb_server_connection.py tests/unit/test_config_package.py -k adb).make typecheck: passed, zero errors.make lint: passed, including formatting, Ruff and the quality ratchet.make test: 2443 passed, 86 failed, 11 skipped, 8 deselected. A pristine archive of upstream351ca842, run with the same interpreter, dependencies and environment, gives 2436 passed, 86 failed, 11 skipped, 8 deselected. The 86 failing test IDs are exactly identical; no new full-suite failures were introduced.git diff --check: passed.The full suite is not green in this local environment. No physical-device validation was performed. Implementation, regression tests and this refresh were prepared with OpenAI Codex assistance.