fixup! fix(recovery): Delete the known secrets from 4s when disabling recovery

Author: poljar

testing/matrix-sdk-integration-testing/src/tests/e2ee.rs

@@ -1,4 +1,7 @@
-use std::sync::{Arc, Mutex};
+use std::{
+    sync::{Arc, Mutex},
+    time::Duration,
+};
 
 use anyhow::Result;
 use assert_matches::assert_matches;
@@ -27,6 +30,7 @@ use matrix_sdk::{
             EventContentFromType, GlobalAccountDataEventType, OriginalSyncMessageLikeEvent,
         },
     },
+    timeout::timeout,
     Client,
 };
 use serde_json::value::to_raw_value;
@@ -1064,12 +1068,22 @@ async fn test_recovery_disabling_deletes_secret_storage_secrets() -> Result<()>
     }
 
     debug!("Checking that the info about the default key has been deleted");
+
     let event_type = GlobalAccountDataEventType::SecretStorageKey(key_id);
-    let content = client
-        .account()
-        .fetch_account_data(event_type.clone())
-        .await?
-        .expect("The key event should be available on the server");
+
+    let get_key_content = async {
+        loop {
+            if let Ok(Some(content)) = client.account().fetch_account_data(event_type.clone()).await
+            {
+                return Some(content);
+            }
+        }
+    };
+
+    let content = timeout(get_key_content, Duration::from_millis(500))
+        .await
+        .expect("We should be able to fetch the key content")
+        .unwrap();
 
     SecretStorageKeyEventContent::from_parts(
         &event_type.to_string(),