Skip to content

fix(nimbus): Approve only our own Kinto review in the selenium teardown #16981

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

Open
jaredlockhart wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −3
Open

fix(nimbus): Approve only our own Kinto review in the selenium teardown #16981

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
5d6f19b
fix(nimbus): Approve the Kinto review left by the selenium teardown
jaredlockhart Aug 25, 2026
f7e2839
Merge branch 'main' into 16978
jaredlockhart Sep 9, 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
3 changes: 2 additions & 1 deletion experimenter/tests/integration/nimbus/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def pytest_addoption(parser):


KINTO_DRIVING_FIXTURES = frozenset({"kinto_client", "live_rollout"})
TEARDOWN_APPROVAL_RETRIES = 15


@pytest.hookimpl(tryfirst=True)
Expand Down Expand Up @@ -172,7 +173,7 @@ def selenium(selenium, experiment_slug, kinto_client):
try:
if not helpers.is_rollout(experiment_slug):
helpers.end_experiment(experiment_slug)
kinto_client.approve()
kinto_client().approve(retries=TEARDOWN_APPROVAL_RETRIES)
except Exception:
pass

Expand Down
4 changes: 2 additions & 2 deletions experimenter/tests/integration/nimbus/kinto/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def _fetch_collection_data(self):
def _has_pending_review(self):
return self._fetch_collection_data()["status"] == KINTO_REVIEW_STATUS

def approve(self):
for _ in range(self.RETRIES):
def approve(self, retries=RETRIES):
for _ in range(retries):
if self._has_pending_review():
try:
self.kinto_http_client.patch_collection(
Expand Down
Loading