Merge pull request JanKaul#150 from JanKaul/fix/rest-catalog-test

Fix/rest catalog test

Author: JanKaul

.github/workflows/rust.yml

@@ -22,6 +22,12 @@ jobs:
       run: make test-iceberg-rust
     - name: Run datafusion-iceberg tests
       run: make test-datafusion_iceberg
+    - name: Run iceberg-rest-catalog tests
+      run: make test-rest-catalog
+    - name: Run iceberg-file-catalog tests
+      run: make test-file-catalog
+    - name: Run iceberg-sql-catalog tests
+      run: make test-sql-catalog
 
   lint:
     runs-on: ubuntu-latest

Makefile

@@ -7,7 +7,15 @@ test-iceberg-rust:
 	cargo test -p iceberg-rust --lib
 
 test-datafusion_iceberg:
-	cargo test -p datafusion_iceberg --tests -j 2
+	cargo test -p datafusion_iceberg --tests -j 2 && cargo clean -p datafusion_iceberg
 
+test-rest-catalog:
+	cargo test -p iceberg-rest-catalog --lib && cargo clean -p iceberg-rest-catalog
+
+test-file-catalog:
+	cargo test -p iceberg-file-catalog --lib && cargo clean -p iceberg-file-catalog
+
+test-sql-catalog:
+	cargo test -p iceberg-sql-catalog --lib && cargo clean -p iceberg-sql-catalog
 clippy:
 	cargo clippy --all-targets --all-features -- -D warnings

catalogs/iceberg-rest-catalog/src/catalog.rs

@@ -215,7 +215,8 @@ impl Catalog for RestCatalog {
             .await
         })
         .await
-        .map_err(Into::<Error>::into) {
+        .map_err(Into::<Error>::into)
+        {
             Ok(_) => Ok(true),
             Err(Error::NotFound(_)) => Ok(false),
             Err(e) => Err(e),
@@ -613,7 +614,7 @@ pub mod tests {
             .await
             .unwrap();
 
-        localstack
+        let command = localstack
             .exec(ExecCommand::new(vec![
                 "awslocal",
                 "s3api",
@@ -624,6 +625,10 @@ pub mod tests {
             .await
             .unwrap();
 
+        while command.exit_code().await.unwrap().is_none() {
+            sleep(Duration::from_millis(100)).await;
+        }
+
         let localstack_host = localstack.get_host().await.unwrap();
         let localstack_port = localstack.get_host_port_ipv4(4566).await.unwrap();
 

catalogs/iceberg-rest-catalog/src/error.rs

@@ -1,6 +1,7 @@
 use iceberg_rust::error::Error;
+use reqwest::StatusCode;
 
-use crate::apis::{self, catalog_api_api::CreateNamespaceError};
+use crate::apis::{self, catalog_api_api::CreateNamespaceError, ResponseContent};
 
 /**
 Error conversion
@@ -11,6 +12,11 @@ impl<T> From<apis::Error<T>> for Error {
             apis::Error::Reqwest(err) => Error::InvalidFormat(err.to_string()),
             apis::Error::Serde(err) => Error::JSONSerde(err),
             apis::Error::Io(err) => Error::IO(err),
+            apis::Error::ResponseError(ResponseContent {
+                status: StatusCode::NOT_FOUND,
+                content,
+                entity: _,
+            }) => Error::NotFound(content),
             apis::Error::ResponseError(err) => Error::InvalidFormat(format!(
                 "Response status: {}, Response content: {}",
                 err.status, err.content

catalogs/iceberg-sql-catalog/src/lib.rs

@@ -760,6 +760,10 @@ pub mod tests {
             .await
             .unwrap();
 
+        while command.exit_code().await.unwrap().is_none() {
+            sleep(Duration::from_millis(100)).await;
+        }
+
         let postgres = Postgres::default()
             .with_db_name("postgres")
             .with_user("postgres")

datafusion_iceberg/tests/integration_trino.rs

@@ -25,6 +25,7 @@ use testcontainers::{
     GenericImage, ImageExt,
 };
 use testcontainers_modules::localstack::LocalStack;
+use tokio::time::sleep;
 
 fn configuration(host: &str, port: u16) -> Configuration {
     Configuration {
@@ -77,7 +78,7 @@ async fn integration_trino_rest() {
         .await
         .unwrap();
 
-    localstack
+    let command = localstack
         .exec(ExecCommand::new(vec![
             "awslocal",
             "s3api",
@@ -88,6 +89,10 @@ async fn integration_trino_rest() {
         .await
         .unwrap();
 
+    while command.exit_code().await.unwrap().is_none() {
+        sleep(Duration::from_millis(100)).await;
+    }
+
     let localstack_host = localstack.get_host().await.unwrap();
     let localstack_port = localstack.get_host_port_ipv4(4566).await.unwrap();