Fix assert_matches! usage in tests/integration/session.rs

scylladb · Feb 12, 2025 · cbcdfac · cbcdfac
1 parent 0063075
commit cbcdfac
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/scylla/tests/integration/session.rs b/scylla/tests/integration/session.rs
@@ -959,21 +959,21 @@ async fn test_request_timeout() {
 
         let mut query: Query = Query::new("SELECT * FROM system_schema.tables");
         query.set_request_timeout(Some(Duration::from_millis(1)));
-        match session.query_unpaged(query, &[]).await {
-            Ok(_) => panic!("the query should have failed due to a client-side timeout"),
-            Err(e) => assert_matches!(e, ExecutionError::RequestTimeout(_)),
-        }
+        assert_matches!(
+            session.query_unpaged(query, &[]).await,
+            Err(ExecutionError::RequestTimeout(_))
+        );
 
         let mut prepared = session
             .prepare("SELECT * FROM system_schema.tables")
             .await
             .unwrap();
 
         prepared.set_request_timeout(Some(Duration::from_millis(1)));
-        match session.execute_unpaged(&prepared, &[]).await {
-            Ok(_) => panic!("the prepared query should have failed due to a client-side timeout"),
-            Err(e) => assert_matches!(e, ExecutionError::RequestTimeout(_)),
-        };
+        assert_matches!(
+            session.execute_unpaged(&prepared, &[]).await,
+            Err(ExecutionError::RequestTimeout(_))
+        );
     }
     {
         let timeouting_session = create_new_session_builder()
@@ -984,10 +984,10 @@ async fn test_request_timeout() {
 
         let mut query = Query::new("SELECT * FROM system_schema.tables");
 
-        match timeouting_session.query_unpaged(query.clone(), &[]).await {
-            Ok(_) => panic!("the query should have failed due to a client-side timeout"),
-            Err(e) => assert_matches!(e, ExecutionError::RequestTimeout(_)),
-        };
+        assert_matches!(
+            timeouting_session.query_unpaged(query.clone(), &[]).await,
+            Err(ExecutionError::RequestTimeout(_))
+        );
 
         query.set_request_timeout(Some(Duration::from_secs(10000)));
 
@@ -1000,10 +1000,10 @@ async fn test_request_timeout() {
             .await
             .unwrap();
 
-        match timeouting_session.execute_unpaged(&prepared, &[]).await {
-            Ok(_) => panic!("the prepared query should have failed due to a client-side timeout"),
-            Err(e) => assert_matches!(e, ExecutionError::RequestTimeout(_)),
-        };
+        assert_matches!(
+            timeouting_session.execute_unpaged(&prepared, &[]).await,
+            Err(ExecutionError::RequestTimeout(_))
+        );
 
         prepared.set_request_timeout(Some(Duration::from_secs(10000)));