feat: Implement test harness via libtest-mimic instead (#2517)

* feat: Implement test harness via libtest-mimic instead Signed-off-by: Xuanwo <[email protected]> * Fix memory test Signed-off-by: Xuanwo <[email protected]> * Format code Signed-off-by: Xuanwo <[email protected]> * Fix build Signed-off-by: Xuanwo <[email protected]> * Fix naming Signed-off-by: Xuanwo <[email protected]> * Fix runtime Signed-off-by: Xuanwo <[email protected]> * polish code Signed-off-by: Xuanwo <[email protected]> * Use rustc test instead for hdfs Signed-off-by: Xuanwo <[email protected]> * Use cargo test instead for services Signed-off-by: Xuanwo <[email protected]> --------- Signed-off-by: Xuanwo <[email protected]>
apache · Jun 23, 2023 · 421b2a6 · 421b2a6
1 parent 047e054
commit 421b2a6
Show file tree

Hide file tree

Showing 23 changed files with 573 additions and 924 deletions.
diff --git a/.github/workflows/service_test_hdfs.yml b/.github/workflows/service_test_hdfs.yml
@@ -62,7 +62,7 @@ jobs:
         working-directory: core
         run: |
           export CLASSPATH=$(find $HADOOP_HOME -iname "*.jar" | xargs echo | tr ' ' ':')
-          cargo nextest run services_hdfs --features services-hdfs
+          cargo test services_hdfs --features services-hdfs
         env:
           HADOOP_HOME: "/home/runner/hadoop-3.3.5"
           LD_LIBRARY_PATH: ${{ env.JAVA_HOME }}/lib/server:${{ env.LD_LIBRARY_PATH }}
@@ -120,7 +120,7 @@ jobs:
         run: |
           export CLASSPATH=$(find $HADOOP_HOME -iname "*.jar" | xargs echo | tr ' ' ':')
 
-          cargo nextest run services_hdfs --features services-hdfs
+          cargo test services_hdfs --features services-hdfs
         env:
           HADOOP_HOME: "/home/runner/hadoop-3.1.3"
           LD_LIBRARY_PATH: ${{ env.JAVA_HOME }}/lib/server:${{ env.LD_LIBRARY_PATH }}

diff --git a/.github/workflows/service_test_rocksdb.yml b/.github/workflows/service_test_rocksdb.yml
@@ -45,12 +45,11 @@ jobs:
         uses: ./.github/actions/setup
         with:
           need-rocksdb: true
-          need-nextest: true
 
       - name: Test
         shell: bash
         working-directory: core
-        run: cargo nextest run rocksdb --features services-rocksdb -j=1
+        run: cargo test rocksdb --features services-rocksdb -j=1
         env:
           OPENDAL_ROCKSDB_TEST: on
           OPENDAL_ROCKSDB_ROOT: /

diff --git a/.github/workflows/service_test_sled.yml b/.github/workflows/service_test_sled.yml
@@ -43,12 +43,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup
-        with:
-          need-nextest: true
       - name: Test
         shell: bash
         working-directory: core
-        run: cargo nextest run sled --features services-sled -j=1
+        run: cargo test sled --features services-sled -j=1
         env:
           RUST_BACKTRACE: full
           RUST_LOG: debug

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/haskell/Cargo.toml b/bindings/haskell/Cargo.toml
@@ -31,5 +31,5 @@ crate-type = ["cdylib"]
 doc = false
 
 [dependencies]
+chrono = "0.4"
 opendal.workspace = true
-chrono = "0.4"
diff --git a/bindings/lua/Cargo.toml b/bindings/lua/Cargo.toml
@@ -27,7 +27,6 @@ license.workspace = true
 repository.workspace = true
 rust-version.workspace = true
 
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -111,14 +111,14 @@ services-cos = [
   "reqsign?/reqwest_request",
 ]
 services-dashmap = ["dep:dashmap"]
+services-dropbox = []
 services-fs = ["tokio/fs"]
 services-ftp = ["dep:suppaftp", "dep:lazy-regex", "dep:bb8", "dep:async-tls"]
 services-gcs = [
   "dep:reqsign",
   "reqsign?/services-google",
   "reqsign?/reqwest_request",
 ]
-services-dropbox = []
 services-gdrive = []
 services-ghac = []
 services-hdfs = ["dep:hdrs"]
@@ -165,6 +165,10 @@ bench = false
 harness = false
 name = "ops"
 
+[[test]]
+harness = false
+name = "behavior"
+
 [dependencies]
 anyhow = { version = "1.0.30", features = ["std"] }
 async-compat = "0.2"
@@ -228,6 +232,7 @@ uuid = { version = "1", features = ["serde", "v4"] }
 [dev-dependencies]
 criterion = { version = "0.4", features = ["async", "async_tokio"] }
 dotenvy = "0.15"
+libtest-mimic = "0.6"
 opentelemetry = { version = "0.19", default-features = false, features = [
   "trace",
 ] }

diff --git a/core/src/services/memory/backend.rs b/core/src/services/memory/backend.rs
@@ -17,6 +17,7 @@
 
 use std::collections::BTreeMap;
 use std::collections::HashMap;
+use std::fmt::Debug;
 use std::sync::Arc;
 
 use async_trait::async_trait;
@@ -64,11 +65,17 @@ impl Builder for MemoryBuilder {
 /// Backend is used to serve `Accessor` support in memory.
 pub type MemoryBackend = typed_kv::Backend<Adapter>;
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Adapter {
     inner: Arc<Mutex<BTreeMap<String, typed_kv::Value>>>,
 }
 
+impl Debug for Adapter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MemoryBackend").finish_non_exhaustive()
+    }
+}
+
 #[async_trait]
 impl typed_kv::Adapter for Adapter {
     fn info(&self) -> typed_kv::Info {

diff --git a/core/tests/behavior/append.rs b/core/tests/behavior/append.rs
@@ -15,68 +15,34 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use std::vec;
+
 use anyhow::Result;
 use futures::io::BufReader;
 use futures::io::Cursor;
 use log::warn;
-use opendal::EntryMode;
-use opendal::ErrorKind;
-use opendal::Operator;
 use sha2::Digest;
 use sha2::Sha256;
 
-use super::utils::*;
-
-/// Test services that meet the following capability:
-///
-/// - can_read
-/// - can_write
-/// - can_append
-macro_rules! behavior_append_test {
-    ($service:ident, $($(#[$meta:meta])* $test:ident),*,) => {
-        paste::item! {
-            $(
-                #[test]
-                $(
-                    #[$meta]
-                )*
-                fn [<append_ $test >]() -> anyhow::Result<()> {
-                    match OPERATOR.as_ref() {
-                        Some(op) if op.info().can_read()
-                            && op.info().can_write()
-                            && op.info().can_append() => RUNTIME.block_on($crate::append::$test(op.clone())),
-                        Some(_) => {
-                            log::warn!("service {} doesn't support append, ignored", opendal::Scheme::$service);
-                            Ok(())
-                        },
-                        None => {
-                            Ok(())
-                        }
-                    }
-                }
-            )*
-        }
-    };
-}
+use crate::*;
 
-#[macro_export]
-macro_rules! behavior_append_tests {
-     ($($service:ident),*) => {
-        $(
-            behavior_append_test!(
-                $service,
-
-                test_append_create_append,
-                test_append_with_dir_path,
-                test_append_with_cache_control,
-                test_append_with_content_type,
-                test_append_with_content_disposition,
-
-                test_appender_futures_copy,
-                test_fuzz_appender,
-            );
-        )*
-    };
+pub fn behavior_append_tests(op: &Operator) -> Vec<Trial> {
+    let cap = op.info().capability();
+
+    if !(cap.read && cap.write && cap.append) {
+        return vec![];
+    }
+
+    async_trials!(
+        op,
+        test_append_create_append,
+        test_append_with_dir_path,
+        test_append_with_cache_control,
+        test_append_with_content_type,
+        test_append_with_content_disposition,
+        test_appender_futures_copy,
+        test_fuzz_appender
+    )
 }
 
 /// Test append to a file must success.