tests/util/chaosproxy: Return Result from break/restore_networking() fns instead of panicking

Author: Turbo87

src/tests/server_binary.rs

@@ -44,7 +44,7 @@ fn startup_without_database() {
     // Break the networking *before* starting the binary, to ensure the binary can fully startup
     // without a database connection. Most of crates.io should not work when started without a
     // database, but unconditional redirects will work.
-    server_bin.chaosproxy.break_networking();
+    server_bin.chaosproxy.break_networking().unwrap();
 
     let running_server = server_bin.start().unwrap();
 

src/tests/unhealthy_database.rs

@@ -25,13 +25,13 @@ fn download_crate_with_broken_networking_primary_database() {
     // do an unconditional redirect to the CDN, without checking whether the crate exists or what
     // the exact capitalization of crate name is.
 
-    app.primary_db_chaosproxy().break_networking();
+    app.primary_db_chaosproxy().break_networking().unwrap();
     assert_unconditional_redirects(&anon);
 
     // After restoring the network and waiting for the database pool to get healthy again redirects
     // should be checked again.
 
-    app.primary_db_chaosproxy().restore_networking();
+    app.primary_db_chaosproxy().restore_networking().unwrap();
     app.as_inner()
         .primary_database
         .wait_until_healthy(DB_HEALTHY_TIMEOUT)
@@ -75,12 +75,12 @@ fn http_error_with_unhealthy_database() {
     let response = anon.get::<()>("/api/v1/summary");
     assert_eq!(response.status(), StatusCode::OK);
 
-    app.primary_db_chaosproxy().break_networking();
+    app.primary_db_chaosproxy().break_networking().unwrap();
 
     let response = anon.get::<()>("/api/v1/summary");
     assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);
 
-    app.primary_db_chaosproxy().restore_networking();
+    app.primary_db_chaosproxy().restore_networking().unwrap();
     app.as_inner()
         .primary_database
         .wait_until_healthy(DB_HEALTHY_TIMEOUT)
@@ -99,14 +99,14 @@ fn fallback_to_replica_returns_user_info() {
         .with_chaos_proxy()
         .with_user();
     app.db_new_user("foo");
-    app.primary_db_chaosproxy().break_networking();
+    app.primary_db_chaosproxy().break_networking().unwrap();
 
     // When the primary database is down, requests are forwarded to the replica database
     let response = owner.get::<()>(URL);
     assert_eq!(response.status(), 200);
 
     // restore primary database connection
-    app.primary_db_chaosproxy().restore_networking();
+    app.primary_db_chaosproxy().restore_networking().unwrap();
     app.as_inner()
         .primary_database
         .wait_until_healthy(DB_HEALTHY_TIMEOUT)
@@ -122,15 +122,15 @@ fn restored_replica_returns_user_info() {
         .with_chaos_proxy()
         .with_user();
     app.db_new_user("foo");
-    app.primary_db_chaosproxy().break_networking();
-    app.replica_db_chaosproxy().break_networking();
+    app.primary_db_chaosproxy().break_networking().unwrap();
+    app.replica_db_chaosproxy().break_networking().unwrap();
 
     // When both primary and replica database are down, the request returns an error
     let response = owner.get::<()>(URL);
     assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);
 
     // Once the replica database is restored, it should serve as a fallback again
-    app.replica_db_chaosproxy().restore_networking();
+    app.replica_db_chaosproxy().restore_networking().unwrap();
     app.as_inner()
         .read_only_replica_database
         .as_ref()
@@ -142,7 +142,7 @@ fn restored_replica_returns_user_info() {
     assert_eq!(response.status(), StatusCode::OK);
 
     // restore connection
-    app.primary_db_chaosproxy().restore_networking();
+    app.primary_db_chaosproxy().restore_networking().unwrap();
     app.as_inner()
         .primary_database
         .wait_until_healthy(DB_HEALTHY_TIMEOUT)
@@ -158,15 +158,15 @@ fn restored_primary_returns_user_info() {
         .with_chaos_proxy()
         .with_user();
     app.db_new_user("foo");
-    app.primary_db_chaosproxy().break_networking();
-    app.replica_db_chaosproxy().break_networking();
+    app.primary_db_chaosproxy().break_networking().unwrap();
+    app.replica_db_chaosproxy().break_networking().unwrap();
 
     // When both primary and replica database are down, the request returns an error
     let response = owner.get::<()>(URL);
     assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);
 
     // Once the replica database is restored, it should serve as a fallback again
-    app.primary_db_chaosproxy().restore_networking();
+    app.primary_db_chaosproxy().restore_networking().unwrap();
     app.as_inner()
         .primary_database
         .wait_until_healthy(DB_HEALTHY_TIMEOUT)

src/tests/util/chaosproxy.rs

@@ -65,16 +65,16 @@ impl ChaosProxy {
         Ok((instance, db_url.into()))
     }
 
-    pub(crate) fn break_networking(&self) {
+    pub(crate) fn break_networking(&self) -> anyhow::Result<usize> {
         self.break_networking_send
             .send(())
-            .expect("failed to send the break_networking message");
+            .context("Failed to send the break_networking message")
     }
 
-    pub(crate) fn restore_networking(&self) {
+    pub(crate) fn restore_networking(&self) -> anyhow::Result<usize> {
         self.restore_networking_send
             .send(())
-            .expect("failed to send the restore_networking message");
+            .context("Failed to send the restore_networking message")
     }
 
     async fn server_loop(&self, initial_listener: TcpListener) -> Result<(), Error> {