build(deps): bump mockito from 0.32.4 to 1.0.0 (#1103)

aggregator/Cargo.toml

@@ -92,7 +92,7 @@ hyper = "0.14.25"
 # Kubernetes clusters. Enable the `test-util` feature for various utilities
 # used in unit tests.
 janus_aggregator = { path = ".", features = ["kube-openssl", "test-util"] }
-mockito = "0.32.4"
+mockito = "1.0.0"
 tempfile = "3.4.0"
 tokio = { version = "1", features = ["test-util"] }  # ensure this remains compatible with the non-dev dependency
 trycmd = "0.14.13"

aggregator/src/aggregator.rs

@@ -8191,7 +8191,9 @@ mod tests {
                         .await;
 
                     // Serve the response via mockito, and run it through post_to_helper's error handling.
-                    let mut server = mockito::Server::new_async().await;
+                    // Workaround: use `new_with_port_async` to skip Mockito's server pool, which
+                    // has a bug in 1.0.0.
+                    let mut server = mockito::Server::new_with_port_async(0).await;
                     let error_mock = server
                         .mock("POST", "/")
                         .with_status(response.status().as_u16().into())

client/Cargo.toml

@@ -27,6 +27,6 @@ url = "2.3.1"
 [dev-dependencies]
 assert_matches = "1"
 janus_core = { path = "../core", features = ["test-util"]}
-mockito = "0.32.4"
+mockito = "1.0.0"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter", "fmt"] }

collector/Cargo.toml

@@ -34,7 +34,7 @@ chrono = "0.4"
 clap = { version = "4.0.27", features = ["derive", "env"] }
 janus_collector = { path = ".", features = ["test-util"] }
 janus_core = { path = "../core", features = ["test-util"] }
-mockito = "0.32.4"
+mockito = "1.0.0"
 rand = "0.8"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter", "fmt"] }

core/Cargo.toml

@@ -62,6 +62,6 @@ janus_core = { path = ".", features = ["test-util"] }
 # lack of support for connecting to servers by IP addresses, which affects many
 # Kubernetes clusters.
 kube = { workspace = true, features = ["openssl-tls"] }
-mockito = "0.32.4"
+mockito = "1.0.0"
 serde_test = "1.0.155"
 url = "2.3.1"

core/src/retries.rs

@@ -44,7 +44,7 @@ pub fn test_http_request_exponential_backoff() -> ExponentialBackoff {
         initial_interval: Duration::from_nanos(1),
         max_interval: Duration::from_nanos(30),
         multiplier: 2.0,
-        max_elapsed_time: Some(Duration::from_millis(10)),
+        max_elapsed_time: Some(Duration::from_millis(100)),
         ..Default::default()
     }
 }