Skip to content

feat: add env_str to snippet_client_v2.Config to allow am instrument command prefix (fixes #1004) #1008

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

Closed
devimano2011 wants to merge 3 commits into from
Closed

feat: add env_str to snippet_client_v2.Config to allow am instrument command prefix (fixes #1004) #1008

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da4a96c
feat: add env_str to snippet_client_v2.Config for am instrument prefi…
devimano2011 May 2, 2026
d2dd8fa
test: add unit tests for Config.env_str (PR #1008)
devimano2011 May 7, 2026
4247c62
fix: move env_str tests outside if __name__ block to class level
devimano2011 May 7, 2026
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
7 changes: 6 additions & 1 deletion mobly/controllers/android_device_lib/snippet_client_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

# The command template to start the snippet server
_LAUNCH_CMD = (
'{shell_cmd} am instrument {user} -w -e action start'
'{shell_cmd} {env_str}am instrument {user} -w -e action start'
' {instrument_options}'
f' {{snippet_package}}/{_INSTRUMENTATION_RUNNER_PACKAGE}'
)
Expand Down Expand Up @@ -112,12 +112,16 @@ class Config:
is because Mobly snippet runner changes the subsequent instrumentation
process.
user_id: The user id under which to launch the snippet process.
env_str: An optional string of environment variables or command wrappers
to prepend to the `am instrument` command. E.g. `'ENV_VAR=value'` or
`'wrapper_cmd'`. Defaults to an empty string.
"""

am_instrument_options: Dict[str, str] = dataclasses.field(
default_factory=dict
)
user_id: Union[int, None] = None
env_str: str = ''


class ConnectionHandshakeCommand(enum.Enum):
Expand Down Expand Up @@ -310,6 +314,7 @@ def start_server(self):
option_str = self._get_instrument_options_str()
cmd = _LAUNCH_CMD.format(
shell_cmd=persists_shell_cmd,
env_str=self._config.env_str + ' ' if self._config.env_str else '',
user=self._get_user_command_string(),
snippet_package=self.package,
instrument_options=option_str,
Expand Down