update error tests to check entire cause chain

petrosagg · petrosagg · commit 675e4ce14bbc · 2025-12-03T12:24:18.000+02:00
Signed-off-by: Petros Angelatos &lt;petrosagg@gmail.com&gt;
diff --git a/src/balancerd/tests/server.rs b/src/balancerd/tests/server.rs
@@ -30,6 +30,7 @@ use mz_frontegg_auth::{
 };
 use mz_frontegg_mock::{FronteggMockServer, models::ApiToken, models::UserConfig};
 use mz_ore::cast::CastFrom;
+use mz_ore::error::ErrorExt;
 use mz_ore::id_gen::{conn_id_org_uuid, org_id_conn_bits};
 use mz_ore::metrics::MetricsRegistry;
 use mz_ore::now::SYSTEM_TIME;
@@ -234,7 +235,10 @@ async fn test_balancer() {
             .unwrap();
         let _ = cancel.cancel_query(tls).await;
         let e = pin!(copy).next().await.unwrap().unwrap_err();
-        assert_contains!(e.to_string(), "canceling statement due to user request");
+        assert_contains!(
+            e.to_string_with_causes(),
+            "canceling statement due to user request"
+        );
 
         // Various tests about reloading of certs.
 
diff --git a/src/environmentd/tests/auth.rs b/src/environmentd/tests/auth.rs
@@ -45,6 +45,7 @@ use mz_frontegg_auth::{
 use mz_frontegg_mock::{
     FronteggMockServer, models::ApiToken, models::TenantApiTokenConfig, models::UserConfig,
 };
+use mz_ore::error::ErrorExt;
 use mz_ore::metrics::MetricsRegistry;
 use mz_ore::now::{NowFn, SYSTEM_TIME};
 use mz_ore::retry::Retry;
@@ -1159,7 +1160,10 @@ async fn test_auth_base_require_tls_frontegg() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
             TestCase::Http {
@@ -1192,7 +1196,10 @@ async fn test_auth_base_require_tls_frontegg() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
             TestCase::Http {
@@ -1226,7 +1233,10 @@ async fn test_auth_base_require_tls_frontegg() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'PUBLIC'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'PUBLIC'"
+                    );
                 })),
             },
             TestCase::Http {
@@ -1304,7 +1314,7 @@ async fn test_auth_base_disable_tls() {
                 configure: Box::new(|_| Ok(())),
                 assert: Assert::Err(Box::new(|err| {
                     assert_eq!(
-                        err.to_string(),
+                        err.to_string_with_causes(),
                         "error performing TLS handshake: server does not support TLS",
                     )
                 })),
@@ -1331,7 +1341,10 @@ async fn test_auth_base_disable_tls() {
                 ssl_mode: SslMode::Disable,
                 configure: Box::new(|_| Ok(())),
                 assert: Assert::DbErr(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
         ],
@@ -1451,7 +1464,10 @@ async fn test_auth_base_require_tls() {
                 ssl_mode: SslMode::Prefer,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::DbErr(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
         ],
@@ -1488,7 +1504,10 @@ async fn test_auth_intermediate_ca_no_intermediary() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| b.set_ca_file(ca.ca_cert_path())),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unable to get local issuer certificate");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unable to get local issuer certificate"
+                    );
                 })),
             },
             TestCase::Http {
diff --git a/src/environmentd/tests/pgwire.rs b/src/environmentd/tests/pgwire.rs
@@ -19,6 +19,7 @@ use fallible_iterator::FallibleIterator;
 use mz_adapter::session::DEFAULT_DATABASE_NAME;
 use mz_environmentd::test_util::{self, PostgresErrorExt};
 use mz_ore::collections::CollectionExt;
+use mz_ore::error::ErrorExt;
 use mz_ore::retry::Retry;
 use mz_ore::{assert_err, assert_ok};
 use mz_pgrepr::{Numeric, Record};
@@ -40,7 +41,8 @@ fn test_bind_params() {
     match client.query("SELECT ROW(1, 2) = $1", &[&"(1,2)"]) {
         Ok(_) => panic!("query with invalid parameters executed successfully"),
         Err(err) => assert!(
-            err.to_string().contains("operator does not exist"),
+            err.to_string_with_causes()
+                .contains("operator does not exist"),
             "unexpected error: {err}"
         ),
     }
diff --git a/src/environmentd/tests/server.rs b/src/environmentd/tests/server.rs
@@ -39,6 +39,7 @@ use mz_ore::cast::CastFrom;
 use mz_ore::cast::CastLossy;
 use mz_ore::cast::TryCastFrom;
 use mz_ore::collections::CollectionExt;
+use mz_ore::error::ErrorExt;
 use mz_ore::metrics::MetricsRegistry;
 use mz_ore::now::{NowFn, SYSTEM_TIME, to_datetime};
 use mz_ore::retry::Retry;
@@ -2121,7 +2122,7 @@ fn test_max_connections_on_all_interfaces() {
         let (mut ws, _resp) = tungstenite::connect(ws_url.clone()).unwrap();
         let err = test_util::auth_with_ws(&mut ws, BTreeMap::default()).unwrap_err();
         assert_contains!(
-            err.to_string(),
+            err.to_string_with_causes(),
             "creating connection would violate max_connections limit (desired: 2, limit: 2, current: 1)"
         );
     }
@@ -2213,7 +2214,7 @@ fn test_max_connections_on_all_interfaces() {
         panic!("unexpected success connecting to server");
     };
     assert_contains!(
-        failure.to_string(),
+        failure.to_string_with_causes(),
         "creating connection would violate max_connections limit (desired: 7, limit: 2, current: 6)"
     );
 }
@@ -2314,7 +2315,7 @@ async fn test_max_connections_limits() {
         connect_regular_user()
             .await
             .expect_err("connect should fail")
-            .to_string(),
+            .to_string_with_causes(),
         "creating connection would violate max_connections limit"
     );
 
@@ -2327,7 +2328,7 @@ async fn test_max_connections_limits() {
         connect_regular_user()
             .await
             .expect_err("connect should fail")
-            .to_string(),
+            .to_string_with_causes(),
         "creating connection would violate max_connections limit"
     );
 
@@ -2344,15 +2345,15 @@ async fn test_max_connections_limits() {
             connect_regular_user()
                 .await
                 .expect_err("connect should fail")
-                .to_string(),
+                .to_string_with_causes(),
             "creating connection would violate max_connections limit"
         );
 
         assert_contains!(
             connect_regular_user()
                 .await
                 .expect_err("connect should fail")
-                .to_string(),
+                .to_string_with_causes(),
             "creating connection would violate max_connections limit"
         );
 
@@ -2367,7 +2368,7 @@ async fn test_max_connections_limits() {
             connect_external_admin()
                 .await
                 .expect_err("connect should fail")
-                .to_string(),
+                .to_string_with_causes(),
             "creating connection would violate max_connections limit"
         );
 
@@ -2386,7 +2387,7 @@ async fn test_max_connections_limits() {
             connect_regular_user()
                 .await
                 .expect_err("connect should fail")
-                .to_string(),
+                .to_string_with_causes(),
             "creating connection would violate max_connections limit"
         );
 
@@ -2400,7 +2401,7 @@ async fn test_max_connections_limits() {
             let client = match connect_regular_user().await {
                 Err(e) => {
                     assert_contains!(
-                        e.to_string(),
+                        e.to_string_with_causes(),
                         "creating connection would violate max_connections limit"
                     );
                     return Err(());
@@ -3126,7 +3127,7 @@ fn test_cancel_read_then_write() {
                     .batch_execute("insert into foo select a, case when mz_unsafe.mz_sleep(ts) > 0 then 0 end as ts from foo")
                     .unwrap_err();
                 assert_contains!(
-                    err.to_string(),
+                    err.to_string_with_causes(),
                     "statement timeout"
                 );
                 client1
@@ -3137,7 +3138,7 @@ fn test_cancel_read_then_write() {
                 .batch_execute("insert into foo values ('blah', 1);")
                 .unwrap_err();
                 assert_contains!(
-                    err.to_string(),
+                    err.to_string_with_causes(),
                     "canceling statement"
                 );
             });
@@ -3947,8 +3948,14 @@ async fn test_github_25388() {
                 .await
             {
                 Ok(_) => Err("unexpected query success".to_string()),
-                Err(err) if err.to_string().contains("dependency was removed") => Ok(()),
-                Err(err) => Err(err.to_string()),
+                Err(err)
+                    if err
+                        .to_string_with_causes()
+                        .contains("dependency was removed") =>
+                {
+                    Ok(())
+                }
+                Err(err) => Err(err.to_string_with_causes()),
             }
         })
         .await
@@ -3976,8 +3983,14 @@ async fn test_github_25388() {
                 .await
             {
                 Ok(_) => Err("unexpected query success".to_string()),
-                Err(err) if err.to_string().contains("dependency was removed") => Ok(()),
-                Err(err) => Err(err.to_string()),
+                Err(err)
+                    if err
+                        .to_string_with_causes()
+                        .contains("dependency was removed") =>
+                {
+                    Ok(())
+                }
+                Err(err) => Err(err.to_string_with_causes()),
             }
         })
         .await
diff --git a/src/environmentd/tests/sql.rs b/src/environmentd/tests/sql.rs
diff --git a/src/sqllogictest/src/runner.rs b/src/sqllogictest/src/runner.rs
