Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

test(desktop-gpui): model relaunch with a fresh API client in queue resume tests

Richie McIlroyb9b1c7bfe9eb
diff --git a/apps/desktop-gpui/src/auth.rs b/apps/desktop-gpui/src/auth.rs
index 53e95f9e9..abd118f28 100644
--- a/apps/desktop-gpui/src/auth.rs
+++ b/apps/desktop-gpui/src/auth.rs
@@ -348,8 +348,8 @@ pub fn api_client() -> Result<reqwest::Client, AuthApiError> {
static SHARED_API_CLIENT: Mutex<Option<(std::time::SystemTime, reqwest::Client)>> =
Mutex::new(None);
-/// Starts the next `authed_request` on a new client, so a test's connection
-/// count cannot see another test's client reach its maximum age.
+/// Drops the shared client, as quitting the app does, for tests that model a
+/// relaunch.
#[cfg(test)]
pub(crate) fn reset_shared_api_client() {
*SHARED_API_CLIENT
diff --git a/apps/desktop-gpui/src/upload/multipart_tests.rs b/apps/desktop-gpui/src/upload/multipart_tests.rs
index 5b41803dc..2db7499aa 100644
--- a/apps/desktop-gpui/src/upload/multipart_tests.rs
+++ b/apps/desktop-gpui/src/upload/multipart_tests.rs
@@ -816,15 +816,17 @@ async fn authed_presign(part: u32) -> Duration {
async fn sequential_api_requests_reuse_one_connection_until_it_idles_out() {
let server = mock_network::start(fast_local_profile());
let _signed_in = SignedIn::new(server.addr);
- auth::reset_shared_api_client();
for part in 1..=20 {
authed_presign(part).await;
}
- assert_eq!(server.connections.load(Ordering::Acquire), 1);
+ // One more if the shared client is replaced mid-loop, by its age or by a
+ // relaunch test on another thread.
+ let reused = server.connections.load(Ordering::Acquire);
+ assert!(reused <= 2, "{reused} connections for 20 requests");
tokio::time::sleep(auth::API_POOL_IDLE_TIMEOUT + Duration::from_millis(500)).await;
authed_presign(21).await;
- assert_eq!(server.connections.load(Ordering::Acquire), 2);
+ assert_eq!(server.connections.load(Ordering::Acquire), reused + 1);
}
/// `cargo test --bin cap-gpui api_request_mock_network_benchmark -- --ignored --nocapture`
diff --git a/apps/desktop-gpui/src/upload/queue/verify_resume_tests.rs b/apps/desktop-gpui/src/upload/queue/verify_resume_tests.rs
index 5b2e8de53..555b58f86 100644
--- a/apps/desktop-gpui/src/upload/queue/verify_resume_tests.rs
+++ b/apps/desktop-gpui/src/upload/queue/verify_resume_tests.rs
@@ -147,6 +147,7 @@ fn saved_instant_upload_resumes_after_quit_mid_transfer() {
mock.drain().await;
mock.new_session();
+ crate::auth::reset_shared_api_client();
let relaunched = Arc::new(Manager::new(LiveBackend, CONFIRMATION_TIMEOUT));
launch(&relaunched, &project).await;
settle(&relaunched).await;
@@ -196,6 +197,7 @@ fn saved_instant_upload_quit_during_verification_confirms_without_reupload() {
mock.drain().await;
mock.new_session();
+ crate::auth::reset_shared_api_client();
let relaunched = Arc::new(Manager::new(LiveBackend, CONFIRMATION_TIMEOUT));
launch(&relaunched, &project).await;
settle(&relaunched).await;