Merge pull request #2814 from PsiACE/metasrv-tests

[test] apply the new test style to databend-meta

Author: drmingdrmer

metasrv/Cargo.toml

@@ -7,6 +7,10 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lib]
+doctest = false
+test = false
+
 [[bin]]
 name = "databend-meta"
 path = "src/bin/metasrv.rs"

metasrv/src/any_error/mod.rs

@@ -14,7 +14,4 @@
 
 mod any_error_impl;
 
-#[cfg(test)]
-mod any_error_test;
-
 pub use any_error_impl::AnyError;

metasrv/src/api/http/v1/mod.rs

@@ -14,8 +14,3 @@
 
 pub mod config;
 pub mod health;
-
-#[cfg(test)]
-mod config_test;
-#[cfg(test)]
-mod health_test;

metasrv/src/api/mod.rs

@@ -15,12 +15,9 @@
 // The api module only used for internal communication, such as GRPC between cluster and the managed HTTP REST API.
 
 mod flight_server;
-mod http;
+pub mod http;
 mod http_service;
 pub mod rpc;
 
-#[cfg(test)]
-mod http_service_test;
-
 pub use flight_server::FlightServer;
 pub use http_service::HttpService;

metasrv/src/configs/mod.rs

@@ -14,7 +14,5 @@
 
 pub mod config;
 
-#[cfg(test)]
-mod config_test;
-
 pub use config::Config;
+pub use config::DATABEND_COMMIT_VERSION;

metasrv/src/lib.rs

@@ -19,17 +19,14 @@ pub mod proto {
     include!(concat!(env!("OUT_DIR"), concat!("/meta.rs")));
 }
 
-#[macro_use]
-pub mod tests;
-
-mod any_error;
+pub mod any_error;
 pub mod api;
 pub mod configs;
 pub mod errors;
 pub mod executor;
 pub mod meta_service;
 pub mod metrics;
-mod store;
+pub mod store;
 
 pub trait Opened {
     /// Return true if it is opened from a previous persistent state.

metasrv/src/meta_service/mod.rs

@@ -20,13 +20,8 @@ pub use network::Network;
 pub use raftmeta::MetaNode;
 
 mod message;
-mod meta_leader;
+pub mod meta_leader;
 mod meta_node_kv_api_impl;
 pub mod meta_service_impl;
 pub mod network;
 pub mod raftmeta;
-
-#[cfg(test)]
-mod meta_service_impl_test;
-#[cfg(test)]
-pub mod raftmeta_test;

metasrv/src/store/mod.rs

@@ -13,7 +13,5 @@
 // limitations under the License.
 
 mod meta_raft_store;
-#[cfg(test)]
-mod meta_raft_store_test;
 
 pub use meta_raft_store::MetaRaftStore;

metasrv/src/any_error/any_error_test.rs renamed to metasrv/tests/it/any_error.rs

@@ -16,8 +16,7 @@ use std::error::Error;
 use std::fmt;
 
 use anyhow::Context;
-
-use crate::any_error::AnyError;
+use databend_meta::any_error::AnyError;
 
 #[test]
 fn test_any_error() -> anyhow::Result<()> {

metasrv/src/api/http/v1/config_test.rs renamed to metasrv/tests/it/api/http/config.rs

@@ -15,6 +15,8 @@
  *
  */
 use common_base::tokio;
+use databend_meta::api::http::v1::config::config_handler;
+use databend_meta::configs::Config;
 use poem::get;
 use poem::http::Method;
 use poem::http::StatusCode;
@@ -25,9 +27,6 @@ use poem::Request;
 use poem::Route;
 use pretty_assertions::assert_eq;
 
-use crate::api::http::v1::config::config_handler;
-use crate::configs::Config;
-
 #[tokio::test]
 async fn test_config() -> common_exception::Result<()> {
     let conf = Config::empty();

metasrv/src/api/http/v1/health_test.rs renamed to metasrv/tests/it/api/http/health.rs

@@ -15,6 +15,7 @@
  *
  */
 use common_base::tokio;
+use databend_meta::api::http::v1::health::health_handler;
 use poem::get;
 use poem::http::Method;
 use poem::http::StatusCode;
@@ -24,8 +25,6 @@ use poem::Request;
 use poem::Route;
 use pretty_assertions::assert_eq;
 
-use crate::api::http::v1::health::health_handler;
-
 #[tokio::test]
 async fn test_health() -> common_exception::Result<()> {
     let cluster_router = Route::new().at("/v1/health", get(health_handler));

metasrv/tests/it/api/http/mod.rs

@@ -0,0 +1,16 @@
+// Copyright 2020 Datafuse Labs.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+pub mod config;
+pub mod health;

metasrv/src/api/http_service_test.rs renamed to metasrv/tests/it/api/http_service.rs

@@ -18,9 +18,9 @@ use std::io::Read;
 use common_base::tokio;
 use common_base::Stoppable;
 use common_exception::Result;
+use databend_meta::api::HttpService;
+use databend_meta::configs::Config;
 
-use crate::api::HttpService;
-use crate::configs::Config;
 use crate::tests::tls_constants::TEST_CA_CERT;
 use crate::tests::tls_constants::TEST_CN_NAME;
 use crate::tests::tls_constants::TEST_SERVER_CERT;

metasrv/tests/it/api/mod.rs

@@ -0,0 +1,16 @@
+// Copyright 2020 Datafuse Labs.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+mod http;
+mod http_service;

metasrv/src/configs/config_test.rs renamed to metasrv/tests/it/configs.rs

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::configs::Config;
+use databend_meta::configs::Config;
 
 #[test]
 fn test_fuse_commit_version() -> anyhow::Result<()> {
-    let v = &crate::configs::config::DATABEND_COMMIT_VERSION;
+    let v = &databend_meta::configs::DATABEND_COMMIT_VERSION;
     assert!(v.len() > 0);
     Ok(())
 }

metasrv/tests/flight/metasrv_flight_api.rs renamed to metasrv/tests/it/flight/metasrv_flight_api.rs

@@ -24,12 +24,13 @@ use common_meta_types::SeqV;
 use common_meta_types::UpsertKVAction;
 use common_meta_types::UpsertKVActionReply;
 use common_tracing::tracing;
-use databend_meta::init_meta_ut;
-use databend_meta::tests::service::new_test_context;
-use databend_meta::tests::start_metasrv_with_context;
 use pretty_assertions::assert_eq;
 use tokio::time::Duration;
 
+use crate::init_meta_ut;
+use crate::tests::service::new_test_context;
+use crate::tests::start_metasrv_with_context;
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_restart() -> anyhow::Result<()> {
     // Fix: Issue 1134  https://github.com/datafuselabs/databend/issues/1134
@@ -41,7 +42,7 @@ async fn test_restart() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (mut tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (mut tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -99,7 +100,7 @@ async fn test_restart() -> anyhow::Result<()> {
 
         // restart by opening existent meta db
         tc.config.raft_config.boot = false;
-        databend_meta::tests::start_metasrv_with_context(&mut tc).await?;
+        crate::tests::start_metasrv_with_context(&mut tc).await?;
     }
 
     tokio::time::sleep(Duration::from_millis(10_000)).await;

metasrv/tests/flight/metasrv_flight_kv_api.rs renamed to metasrv/tests/it/flight/metasrv_flight_kv_api.rs

@@ -15,14 +15,15 @@
 use common_base::tokio;
 use common_meta_api::KVApiTestSuite;
 use common_meta_flight::MetaFlightClient;
-use databend_meta::init_meta_ut;
+
+use crate::init_meta_ut;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_kv_api_mget() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -34,7 +35,7 @@ async fn test_kv_api_list() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -46,7 +47,7 @@ async fn test_kv_api_delete() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -58,7 +59,7 @@ async fn test_kv_api_update() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -72,7 +73,7 @@ async fn test_kv_api_update_meta() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -84,7 +85,7 @@ async fn test_kv_api_timeout() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -96,7 +97,7 @@ async fn test_kv_api_write_read() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 

metasrv/tests/flight/metasrv_flight_meta_api.rs renamed to metasrv/tests/it/flight/metasrv_flight_meta_api.rs

@@ -15,14 +15,15 @@
 use common_base::tokio;
 use common_meta_api::MetaApiTestSuite;
 use common_meta_flight::MetaFlightClient;
-use databend_meta::init_meta_ut;
+
+use crate::init_meta_ut;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_meta_api_database_create_get_drop() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -34,7 +35,7 @@ async fn test_meta_api_database_list() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -46,7 +47,7 @@ async fn test_meta_api_table_create_get_drop() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -58,7 +59,7 @@ async fn test_meta_api_table_list() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
 
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
 
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
@@ -73,7 +74,7 @@ async fn test_meta_api_table_list() -> anyhow::Result<()> {
 async fn test_meta_api_flight_get_database_meta_ddl_table() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
     let test_db = "db1";
@@ -151,7 +152,7 @@ async fn test_meta_api_flight_get_database_meta_ddl_table() -> anyhow::Result<()
 async fn test_meta_api_flight_get_database_meta_empty_db() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
     // Empty Database
@@ -165,7 +166,7 @@ async fn test_meta_api_flight_get_database_meta_empty_db() -> anyhow::Result<()>
 async fn test_meta_api_flight_get_database_meta_ddl_db() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_meta_ut!();
     let _ent = ut_span.enter();
-    let (_tc, addr) = databend_meta::tests::start_metasrv().await?;
+    let (_tc, addr) = crate::tests::start_metasrv().await?;
     let client = MetaFlightClient::try_create(addr.as_str(), "root", "xxx").await?;
 
     // create-db operation will increases meta_version