diff --git a/experimenter/tests/integration/nimbus/conftest.py b/experimenter/tests/integration/nimbus/conftest.py index bdb9fc39ad..08b707b645 100755 --- a/experimenter/tests/integration/nimbus/conftest.py +++ b/experimenter/tests/integration/nimbus/conftest.py @@ -55,6 +55,7 @@ def pytest_addoption(parser): KINTO_DRIVING_FIXTURES = frozenset({"kinto_client", "live_rollout"}) +TEARDOWN_APPROVAL_RETRIES = 15 @pytest.hookimpl(tryfirst=True) @@ -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 diff --git a/experimenter/tests/integration/nimbus/kinto/client.py b/experimenter/tests/integration/nimbus/kinto/client.py index b3db887118..9fd7ae2d97 100755 --- a/experimenter/tests/integration/nimbus/kinto/client.py +++ b/experimenter/tests/integration/nimbus/kinto/client.py @@ -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(