From 173a8f67a12c975790795fe63035e5878c282f52 Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Wed, 16 Nov 2022 11:35:12 +0800 Subject: [PATCH] test: ignore empty s3 bucket (#529) --- src/object-store/tests/object_store_test.rs | 22 +++++++++++---------- src/query/src/expr.rs | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/object-store/tests/object_store_test.rs b/src/object-store/tests/object_store_test.rs index 2b63ac0487..01dd839106 100644 --- a/src/object-store/tests/object_store_test.rs +++ b/src/object-store/tests/object_store_test.rs @@ -104,18 +104,20 @@ async fn test_fs_backend() -> Result<()> { #[tokio::test] async fn test_s3_backend() -> Result<()> { logging::init_default_ut_logging(); - if env::var("GT_S3_BUCKET").is_ok() { - logging::info!("Running s3 test."); + if let Ok(bucket) = env::var("GT_S3_BUCKET") { + if !bucket.is_empty() { + logging::info!("Running s3 test."); - let accessor = s3::Builder::default() - .access_key_id(&env::var("GT_S3_ACCESS_KEY_ID")?) - .secret_access_key(&env::var("GT_S3_ACCESS_KEY")?) - .bucket(&env::var("GT_S3_BUCKET")?) - .build()?; + let accessor = s3::Builder::default() + .access_key_id(&env::var("GT_S3_ACCESS_KEY_ID")?) + .secret_access_key(&env::var("GT_S3_ACCESS_KEY")?) + .bucket(&bucket) + .build()?; - let store = ObjectStore::new(accessor); - test_object_crud(&store).await?; - test_object_list(&store).await?; + let store = ObjectStore::new(accessor); + test_object_crud(&store).await?; + test_object_list(&store).await?; + } } Ok(()) diff --git a/src/query/src/expr.rs b/src/query/src/expr.rs index d1be7904f6..3a2a59181e 100644 --- a/src/query/src/expr.rs +++ b/src/query/src/expr.rs @@ -11,5 +11,3 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. - -