From d27bfca5e4eb46141ebd3649d823c5b68d59abf6 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 22 Feb 2024 16:14:42 +0100 Subject: [PATCH] test: rename `no_retry_test_client` to `{{SAME}}_with_server` as it also returns a mocking server And use `no_retry_test_client` in there. --- crates/matrix-sdk/tests/integration/client.rs | 8 ++++---- .../tests/integration/encryption/backups.rs | 14 +++++++------- .../tests/integration/encryption/recovery.rs | 10 +++++----- .../integration/encryption/secret_storage.rs | 6 +++--- crates/matrix-sdk/tests/integration/main.rs | 13 ++++++------- .../matrix-sdk/tests/integration/matrix_auth.rs | 16 ++++++++-------- .../tests/integration/refresh_token.rs | 8 ++++---- 7 files changed, 37 insertions(+), 38 deletions(-) diff --git a/crates/matrix-sdk/tests/integration/client.rs b/crates/matrix-sdk/tests/integration/client.rs index 3069bb055..a719213ee 100644 --- a/crates/matrix-sdk/tests/integration/client.rs +++ b/crates/matrix-sdk/tests/integration/client.rs @@ -45,7 +45,7 @@ use wiremock::{ Mock, Request, ResponseTemplate, }; -use crate::{logged_in_client, mock_sync, no_retry_test_client}; +use crate::{logged_in_client, mock_sync, no_retry_test_client_with_server}; #[async_test] async fn sync() { @@ -75,7 +75,7 @@ async fn devices() { #[async_test] async fn delete_devices() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/delete_devices")) @@ -141,7 +141,7 @@ async fn delete_devices() { #[async_test] async fn resolve_room_alias() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("GET")) .and(path("/_matrix/client/r0/directory/room/%23alias:example.org")) @@ -223,7 +223,7 @@ async fn join_room_by_id_or_alias() { #[async_test] async fn room_search_all() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("GET")) .and(path("/_matrix/client/r0/publicRooms")) diff --git a/crates/matrix-sdk/tests/integration/encryption/backups.rs b/crates/matrix-sdk/tests/integration/encryption/backups.rs index 291003860..2cb995874 100644 --- a/crates/matrix-sdk/tests/integration/encryption/backups.rs +++ b/crates/matrix-sdk/tests/integration/encryption/backups.rs @@ -43,7 +43,7 @@ use wiremock::{ }; use crate::{ - encryption::mock_secret_store_with_backup_key, mock_sync, no_retry_test_client, + encryption::mock_secret_store_with_backup_key, mock_sync, no_retry_test_client_with_server, test_client_builder_with_server, }; @@ -85,7 +85,7 @@ async fn create() { tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; assert!( !client.encryption().backups().are_enabled().await, @@ -160,7 +160,7 @@ async fn creation_failure() { meta: SessionMeta { user_id: user_id.into(), device_id: device_id!("DEVICEID").to_owned() }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); mount_once( @@ -241,7 +241,7 @@ async fn disabling() { meta: SessionMeta { user_id: user_id.into(), device_id: device_id!("DEVICEID").to_owned() }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); mount_once( @@ -423,7 +423,7 @@ async fn steady_state_waiting() { meta: SessionMeta { user_id: user_id.into(), device_id: device_id!("DEVICEID").to_owned() }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); setup_backups(&client, &server).await; @@ -607,7 +607,7 @@ async fn incremental_upload_of_keys() -> Result<()> { meta: SessionMeta { user_id: user_id.into(), device_id: device_id!("DEVICEID").to_owned() }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); let backups = client.encryption().backups(); @@ -788,7 +788,7 @@ async fn steady_state_waiting_errors() { meta: SessionMeta { user_id: user_id.into(), device_id: device_id!("DEVICEID").to_owned() }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); let result = client.encryption().backups().wait_for_steady_state().await; diff --git a/crates/matrix-sdk/tests/integration/encryption/recovery.rs b/crates/matrix-sdk/tests/integration/encryption/recovery.rs index b796c9399..37075e0a3 100644 --- a/crates/matrix-sdk/tests/integration/encryption/recovery.rs +++ b/crates/matrix-sdk/tests/integration/encryption/recovery.rs @@ -37,8 +37,8 @@ use wiremock::{ }; use crate::{ - encryption::mock_secret_store_with_backup_key, logged_in_client, no_retry_test_client, - test_client_builder_with_server, + encryption::mock_secret_store_with_backup_key, logged_in_client, + no_retry_test_client_with_server, test_client_builder_with_server, }; async fn test_client(user_id: &UserId) -> (Client, wiremock::MockServer) { @@ -172,7 +172,7 @@ async fn recovery_status_secret_storage_set_up() { tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; mock_secret_store_with_backup_key(user_id, KEY_ID, &server).await; @@ -193,7 +193,7 @@ async fn recovery_status_secret_storage_not_set_up() { tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("GET")) .and(path(format!( @@ -707,7 +707,7 @@ async fn recover_and_reset() { tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; mock_secret_store_with_backup_key(user_id, KEY_ID, &server).await; diff --git a/crates/matrix-sdk/tests/integration/encryption/secret_storage.rs b/crates/matrix-sdk/tests/integration/encryption/secret_storage.rs index 3bcb2944a..41a89778d 100644 --- a/crates/matrix-sdk/tests/integration/encryption/secret_storage.rs +++ b/crates/matrix-sdk/tests/integration/encryption/secret_storage.rs @@ -23,7 +23,7 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use crate::{logged_in_client, no_retry_test_client}; +use crate::{logged_in_client, no_retry_test_client_with_server}; const SECRET_STORE_KEY: &str = "EsTj 3yST y93F SLpB jJsz eAXc 2XzA ygD3 w69H fGaN TKBj jXEd"; @@ -375,7 +375,7 @@ async fn restore_cross_signing_from_secret_store() { }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); mock_secret_store_key( @@ -576,7 +576,7 @@ async fn is_secret_storage_enabled() { }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); { diff --git a/crates/matrix-sdk/tests/integration/main.rs b/crates/matrix-sdk/tests/integration/main.rs index dd7eb7122..0c3b51632 100644 --- a/crates/matrix-sdk/tests/integration/main.rs +++ b/crates/matrix-sdk/tests/integration/main.rs @@ -2,9 +2,9 @@ #![cfg(not(target_arch = "wasm32"))] use matrix_sdk::{ - config::{RequestConfig, SyncSettings}, + config::SyncSettings, matrix_auth::{MatrixSession, MatrixSessionTokens}, - test_utils::test_client_builder, + test_utils::{no_retry_test_client, test_client_builder}, Client, ClientBuilder, }; use matrix_sdk_base::SessionMeta; @@ -34,10 +34,9 @@ async fn test_client_builder_with_server() -> (ClientBuilder, MockServer) { (builder, server) } -async fn no_retry_test_client() -> (Client, MockServer) { - let (builder, server) = test_client_builder_with_server().await; - let client = - builder.request_config(RequestConfig::new().disable_retry()).build().await.unwrap(); +async fn no_retry_test_client_with_server() -> (Client, MockServer) { + let server = MockServer::start().await; + let client = no_retry_test_client(Some(server.uri().to_string())).await; (client, server) } @@ -49,7 +48,7 @@ async fn logged_in_client() -> (Client, MockServer) { }, tokens: MatrixSessionTokens { access_token: "1234".to_owned(), refresh_token: None }, }; - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; client.restore_session(session).await.unwrap(); (client, server) diff --git a/crates/matrix-sdk/tests/integration/matrix_auth.rs b/crates/matrix-sdk/tests/integration/matrix_auth.rs index b0d9f60a3..2bbe2381b 100644 --- a/crates/matrix-sdk/tests/integration/matrix_auth.rs +++ b/crates/matrix-sdk/tests/integration/matrix_auth.rs @@ -31,7 +31,7 @@ use wiremock::{ Mock, MockServer, Request, ResponseTemplate, }; -use crate::{logged_in_client, no_retry_test_client, test_client_builder_with_server}; +use crate::{logged_in_client, no_retry_test_client_with_server, test_client_builder_with_server}; #[async_test] async fn test_restore_session() { @@ -46,7 +46,7 @@ async fn test_restore_session() { #[async_test] async fn test_login() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; let homeserver = Url::parse(&server.uri()).unwrap(); Mock::given(method("GET")) @@ -85,7 +85,7 @@ async fn test_login() { #[async_test] async fn test_login_with_discovery() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/login")) @@ -103,7 +103,7 @@ async fn test_login_with_discovery() { #[async_test] async fn test_login_no_discovery() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/login")) @@ -122,7 +122,7 @@ async fn test_login_no_discovery() { #[async_test] #[cfg(feature = "sso-login")] async fn test_login_with_sso() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/login")) @@ -159,7 +159,7 @@ async fn test_login_with_sso() { #[async_test] async fn test_login_with_sso_token() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("GET")) .and(path("/_matrix/client/r0/login")) @@ -194,7 +194,7 @@ async fn test_login_with_sso_token() { #[async_test] async fn test_login_error() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/login")) @@ -225,7 +225,7 @@ async fn test_login_error() { #[async_test] async fn test_register_error() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/register")) diff --git a/crates/matrix-sdk/tests/integration/refresh_token.rs b/crates/matrix-sdk/tests/integration/refresh_token.rs index 9a00312fa..368bf4b08 100644 --- a/crates/matrix-sdk/tests/integration/refresh_token.rs +++ b/crates/matrix-sdk/tests/integration/refresh_token.rs @@ -28,7 +28,7 @@ use wiremock::{ Mock, ResponseTemplate, }; -use crate::{logged_in_client, no_retry_test_client, test_client_builder_with_server}; +use crate::{logged_in_client, no_retry_test_client_with_server, test_client_builder_with_server}; fn session() -> MatrixSession { MatrixSession { @@ -45,7 +45,7 @@ fn session() -> MatrixSession { #[async_test] async fn test_login_username_refresh_token() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/login")) @@ -74,7 +74,7 @@ async fn test_login_username_refresh_token() { #[async_test] #[cfg(feature = "sso-login")] async fn login_sso_refresh_token() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/login")) @@ -118,7 +118,7 @@ async fn login_sso_refresh_token() { #[async_test] async fn register_refresh_token() { - let (client, server) = no_retry_test_client().await; + let (client, server) = no_retry_test_client_with_server().await; Mock::given(method("POST")) .and(path("/_matrix/client/r0/register"))