csampez
diff --git a/‎healthcare/api-client/v1beta1/fhir/fhir_stores_test.py
Copy file name to clipboardExpand all lines: healthcare/api-client/v1beta1/fhir/fhir_stores_test.py
+10-3Lines changed: 10 additions & 3 deletions b/‎healthcare/api-client/v1beta1/fhir/fhir_stores_test.py
Copy file name to clipboardExpand all lines: healthcare/api-client/v1beta1/fhir/fhir_stores_test.py
+10-3Lines changed: 10 additions & 3 deletions
@@ -15,7 +15,9 @@
 import os
 import uuid
 
+import backoff
 import pytest
+from requests.exceptions import HTTPError
 
 import fhir_stores  # noqa
 
@@ -57,9 +59,14 @@ def test_fhir_store():
 
 
 def test_create_delete_fhir_store(test_dataset, capsys):
-    fhir_stores.create_fhir_store(
-        service_account_json, project_id, cloud_region, dataset_id, fhir_store_id
-    )
+    # We see HttpErrors with "dataset not initialized" message.
+    # I think retry will mitigate the flake.
+    @backoff.on_exception(backoff.expo, HTTPError, max_time=120)
+    def create():
+        fhir_stores.create_fhir_store(
+            service_account_json, project_id, cloud_region, dataset_id, fhir_store_id
+        )
+    create()
 
     fhir_stores.delete_fhir_store(
         service_account_json, project_id, cloud_region, dataset_id, fhir_store_id