From 784581be76a23902f17d578e9bc5fa461a7b0c21 Mon Sep 17 00:00:00 2001 From: Pierrick Couderc Date: Mon, 26 Aug 2024 15:38:26 +0200 Subject: [PATCH] Etherlink/Tests: add back __FILE__ Otherwise all the tests belong to setup.ml --- etherlink/tezt/lib/setup.ml | 13 +++++++------ etherlink/tezt/lib/setup.mli | 2 ++ etherlink/tezt/tests/dal_sequencer.ml | 5 ++++- etherlink/tezt/tests/evm_sequencer.ml | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/etherlink/tezt/lib/setup.ml b/etherlink/tezt/lib/setup.ml index 3b88df0b3a90..72feeefdfc75 100644 --- a/etherlink/tezt/lib/setup.ml +++ b/etherlink/tezt/lib/setup.ml @@ -336,7 +336,7 @@ let setup_sequencer ?sequencer_rpc_port ?sequencer_private_rpc_port } (* Register a single variant of a test but for all protocols. *) -let register_test ?sequencer_rpc_port ?sequencer_private_rpc_port +let register_test ~__FILE__ ?sequencer_rpc_port ?sequencer_private_rpc_port ?genesis_timestamp ?time_between_blocks ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks @@ -416,11 +416,11 @@ let register_test ?sequencer_rpc_port ?sequencer_private_rpc_port ~tags protocols -let register_test_for_kernels ?sequencer_rpc_port ?sequencer_private_rpc_port - ?genesis_timestamp ?time_between_blocks ?max_blueprints_lag - ?max_blueprints_ahead ?max_blueprints_catchup ?catchup_cooldown - ?delayed_inbox_timeout ?delayed_inbox_min_levels ?max_number_of_chunks - ?bootstrap_accounts ?sequencer ?sequencer_pool_address +let register_test_for_kernels ~__FILE__ ?sequencer_rpc_port + ?sequencer_private_rpc_port ?genesis_timestamp ?time_between_blocks + ?max_blueprints_lag ?max_blueprints_ahead ?max_blueprints_catchup + ?catchup_cooldown ?delayed_inbox_timeout ?delayed_inbox_min_levels + ?max_number_of_chunks ?bootstrap_accounts ?sequencer ?sequencer_pool_address ?(kernels = Kernel.all) ?da_fee ?minimum_base_fee_per_gas ?preimages_dir ?maximum_allowed_ticks ?maximum_gas_per_transaction ?max_blueprint_lookahead_in_seconds ?enable_fa_bridge ?history_mode @@ -429,6 +429,7 @@ let register_test_for_kernels ?sequencer_rpc_port ?sequencer_private_rpc_port List.iter (fun kernel -> register_test + ~__FILE__ ?sequencer_rpc_port ?sequencer_private_rpc_port ?commitment_period diff --git a/etherlink/tezt/lib/setup.mli b/etherlink/tezt/lib/setup.mli index 39f62831587e..e2261b4816b6 100644 --- a/etherlink/tezt/lib/setup.mli +++ b/etherlink/tezt/lib/setup.mli @@ -52,6 +52,7 @@ val run_new_observer_node : tests and starts the test. For each of the parameters, please refer to [Evm_node]. *) val register_test : + __FILE__:string -> ?sequencer_rpc_port:int -> ?sequencer_private_rpc_port:int -> ?genesis_timestamp:Client.timestamp -> @@ -92,6 +93,7 @@ val register_test : tests and starts the test. For each of the parameters, please refer to [Evm_node]. The test is registered for each kernel. *) val register_test_for_kernels : + __FILE__:string -> ?sequencer_rpc_port:int -> ?sequencer_private_rpc_port:int -> ?genesis_timestamp:Client.timestamp -> diff --git a/etherlink/tezt/tests/dal_sequencer.ml b/etherlink/tezt/tests/dal_sequencer.ml index b01dddc11899..4379e33cdefa 100644 --- a/etherlink/tezt/tests/dal_sequencer.ml +++ b/etherlink/tezt/tests/dal_sequencer.ml @@ -24,7 +24,10 @@ open Setup open Rpc.Syntax let register_test = - register_test_for_kernels ~enable_dal:true ~threshold_encryption:false + register_test_for_kernels + ~__FILE__ + ~enable_dal:true + ~threshold_encryption:false (* This test is similar to {Evm_sequencer.test_publish_blueprints} but it also checks that all 5 blueprints sent from the sequencer were published on the diff --git a/etherlink/tezt/tests/evm_sequencer.ml b/etherlink/tezt/tests/evm_sequencer.ml index b8b264ba5ff4..1758e5f8070a 100644 --- a/etherlink/tezt/tests/evm_sequencer.ml +++ b/etherlink/tezt/tests/evm_sequencer.ml @@ -222,6 +222,7 @@ let register_all ?sequencer_rpc_port ?sequencer_private_rpc_port List.iter (fun (enable_dal, dal_tags) -> register_test_for_kernels + ~__FILE__ ?sequencer_rpc_port ?sequencer_private_rpc_port ?commitment_period @@ -360,6 +361,7 @@ let test_remove_sequencer = let test_patch_state = register_test (* It's a node specific test. *) + ~__FILE__ ~kernel:Kernel.Latest ~enable_dal:false ~tags:["evm"; "patch"; "state"] -- GitLab