Handle file_lock

Signed-off-by: Heinz N. Gies <heinz@licenser.net>

serial_test/src/parallel_file_lock.rs

@@ -1,11 +1,16 @@
-use std::panic;
+use std::{panic, time::Duration};
 
 use futures::FutureExt;
 
 use crate::file_lock::make_lock_for_name_and_path;
 
 #[doc(hidden)]
-pub fn fs_parallel_core(name: &str, path: Option<&str>, function: fn()) {
+pub fn fs_parallel_core(
+    name: &str,
+    _max_wait: Option<Duration>,
+    path: Option<&str>,
+    function: fn(),
+) {
     make_lock_for_name_and_path(name, path).start_parallel();
     let res = panic::catch_unwind(|| {
         function();
@@ -19,6 +24,7 @@ pub fn fs_parallel_core(name: &str, path: Option<&str>, function: fn()) {
 #[doc(hidden)]
 pub fn fs_parallel_core_with_return<E>(
     name: &str,
+    _max_wait: Option<Duration>,
     path: Option<&str>,
     function: fn() -> Result<(), E>,
 ) -> Result<(), E> {
@@ -36,6 +42,7 @@ pub fn fs_parallel_core_with_return<E>(
 #[doc(hidden)]
 pub async fn fs_async_parallel_core_with_return<E>(
     name: &str,
+    _max_wait: Option<Duration>,
     path: Option<&str>,
     fut: impl std::future::Future<Output = Result<(), E>> + panic::UnwindSafe,
 ) -> Result<(), E> {
@@ -53,6 +60,7 @@ pub async fn fs_async_parallel_core_with_return<E>(
 #[doc(hidden)]
 pub async fn fs_async_parallel_core(
     name: &str,
+    _max_wait: Option<Duration>,
     path: Option<&str>,
     fut: impl std::future::Future<Output = ()> + panic::UnwindSafe,
 ) {
@@ -84,6 +92,7 @@ mod tests {
         let _ = panic::catch_unwind(|| {
             fs_parallel_core(
                 "unlock_on_assert_sync_without_return",
+                None,
                 Some(&lock_path),
                 || {
                     assert!(false);
@@ -99,6 +108,7 @@ mod tests {
         let _ = panic::catch_unwind(|| {
             fs_parallel_core_with_return(
                 "unlock_on_assert_sync_with_return",
+                None,
                 Some(&lock_path),
                 || -> Result<(), Error> {
                     assert!(false);
@@ -118,6 +128,7 @@ mod tests {
         async fn call_serial_test_fn(lock_path: &str) {
             fs_async_parallel_core(
                 "unlock_on_assert_async_without_return",
+                None,
                 Some(&lock_path),
                 demo_assert(),
             )
@@ -146,6 +157,7 @@ mod tests {
         async fn call_serial_test_fn(lock_path: &str) {
             fs_async_parallel_core_with_return(
                 "unlock_on_assert_async_with_return",
+                None,
                 Some(&lock_path),
                 demo_assert(),
             )

serial_test/src/serial_file_lock.rs

@@ -1,7 +1,9 @@
+use std::time::Duration;
+
 use crate::file_lock::make_lock_for_name_and_path;
 
 #[doc(hidden)]
-pub fn fs_serial_core(name: &str, path: Option<&str>, function: fn()) {
+pub fn fs_serial_core(name: &str, _max_wait: Option<Duration>, path: Option<&str>, function: fn()) {
     let mut lock = make_lock_for_name_and_path(name, path);
     lock.start_serial();
     function();
@@ -11,6 +13,7 @@ pub fn fs_serial_core(name: &str, path: Option<&str>, function: fn()) {
 #[doc(hidden)]
 pub fn fs_serial_core_with_return<E>(
     name: &str,
+    _max_wait: Option<Duration>,
     path: Option<&str>,
     function: fn() -> Result<(), E>,
 ) -> Result<(), E> {
@@ -24,6 +27,7 @@ pub fn fs_serial_core_with_return<E>(
 #[doc(hidden)]
 pub async fn fs_async_serial_core_with_return<E>(
     name: &str,
+    _max_wait: Option<Duration>,
     path: Option<&str>,
     fut: impl std::future::Future<Output = Result<(), E>>,
 ) -> Result<(), E> {
@@ -37,6 +41,7 @@ pub async fn fs_async_serial_core_with_return<E>(
 #[doc(hidden)]
 pub async fn fs_async_serial_core(
     name: &str,
+    _max_wait: Option<Duration>,
     path: Option<&str>,
     fut: impl std::future::Future<Output = ()>,
 ) {
@@ -57,14 +62,14 @@ mod tests {
 
     #[test]
     fn test_serial() {
-        fs_serial_core("test", None, || {});
+        fs_serial_core("test", None, None, || {});
     }
 
     #[test]
     fn unlock_on_assert_sync_without_return() {
         let lock_path = path_for_name("unlock_on_assert_sync_without_return");
         let _ = panic::catch_unwind(|| {
-            fs_serial_core("foo", Some(&lock_path), || {
+            fs_serial_core("foo", None, Some(&lock_path), || {
                 assert!(false);
             })
         });

serial_test_derive/src/lib.rs

@@ -309,6 +309,9 @@ fn local_parallel_core(
 
 fn fs_args(attr: proc_macro2::TokenStream) -> Vec<Box<dyn ToTokens>> {
     let config = get_core_key(attr);
+    if config.timeout.is_some() {
+        panic!("Timeout is not supported for file_serial");
+    }
     vec![
         Box::new(config.name),
         Box::new(QuoteOption(config.timeout)),