Skip to content

fix(nimbus): poll logcat for fenix log-state row instead of fixed sleep #15631

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
jaredlockhart merged 1 commit into from
May 15, 2026
Merged

fix(nimbus): poll logcat for fenix log-state row instead of fixed sleep #15631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions experimenter/tests/integration/nimbus/android/test_fenix_enrollment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

FENIX_APP = BaseExperimentApplications.FIREFOX_FENIX.value
APP_APPLY_WAIT = 15
LOG_STATE_WAIT = 5
LOG_STATE_TIMEOUT = 60
LOG_STATE_POLL_INTERVAL = 1


@pytest.mark.fenix_enrollment
Expand Down Expand Up @@ -59,17 +60,24 @@ def test_fenix_enrollment(
subprocess.check_call(
["nimbus-cli", "--app", FENIX_APP, "--channel", fenix_channel, "log-state"]
)
time.sleep(LOG_STATE_WAIT)

logcat = subprocess.check_output(["adb", "logcat", "-d"], text=True)

pattern = re.compile(
rf"nimbus_client:\s*{re.escape(experiment_slug)}\s+\|\s*\S+\s+\|\s*(\S+)"
)
match = pattern.search(logcat)

logcat = ""
match = None
deadline = time.monotonic() + LOG_STATE_TIMEOUT
while time.monotonic() < deadline:
logcat = subprocess.check_output(["adb", "logcat", "-d"], text=True)
match = pattern.search(logcat)
if match is not None:
break
time.sleep(LOG_STATE_POLL_INTERVAL)

nimbus_lines = [line for line in logcat.splitlines() if "nimbus_client" in line]
assert match is not None, (
f"No log-state row found for {experiment_slug}.\n"
f"No log-state row found for {experiment_slug} after {LOG_STATE_TIMEOUT}s.\n"
f"--- last 30 nimbus_client lines ---\n" + "\n".join(nimbus_lines[-30:])
)
enrolled_branch = match.group(1)
Expand Down
Loading