From f2c19443e17f0f6e276e006df850238a146263f1 Mon Sep 17 00:00:00 2001 From: lykimq Date: Fri, 7 Apr 2023 17:10:27 +0200 Subject: [PATCH 01/29] Alcotezt-UX: fix invocation headers, opt. titles for [lib_client] in all protocols --- .../lib_client/test/test_client_proto_context.ml | 9 +++------ .../lib_client/test/test_client_proto_contracts.ml | 7 ++++--- .../lib_client/test/test_michelson_v1_macros.ml | 7 ++++--- src/proto_016_PtMumbai/lib_client/test/test_proxy.ml | 7 ++++--- .../lib_client/test/test_client_proto_context.ml | 9 +++------ .../lib_client/test/test_client_proto_contracts.ml | 7 ++++--- .../lib_client/test/test_michelson_v1_macros.ml | 7 ++++--- src/proto_017_PtNairob/lib_client/test/test_proxy.ml | 7 ++++--- .../lib_client/test/test_client_proto_context.ml | 9 +++------ .../lib_client/test/test_client_proto_contracts.ml | 7 ++++--- .../lib_client/test/test_michelson_v1_macros.ml | 7 ++++--- src/proto_alpha/lib_client/test/test_proxy.ml | 7 ++++--- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/proto_016_PtMumbai/lib_client/test/test_client_proto_context.ml b/src/proto_016_PtMumbai/lib_client/test/test_client_proto_context.ml index e178bc95b909..e3331c08f122 100644 --- a/src/proto_016_PtMumbai/lib_client/test/test_client_proto_context.ml +++ b/src/proto_016_PtMumbai/lib_client/test/test_client_proto_context.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Client - Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe \ + -- --file test_client_proto_context.ml Subject: Tests roundtrips of batch_transfer_operation_encoding *) @@ -65,8 +66,4 @@ let tests = (binary_roundtrip Client_proto_context.batch_transfer_operation_encoding); ] -let () = - Alcotest.run - ~__FILE__ - "Client proto context" - [(Protocol.name ^ ": Encodings", qcheck_wrap tests)] +let () = Alcotest.run ~__FILE__ Protocol.name [("Encodings", qcheck_wrap tests)] diff --git a/src/proto_016_PtMumbai/lib_client/test/test_client_proto_contracts.ml b/src/proto_016_PtMumbai/lib_client/test/test_client_proto_contracts.ml index fecc84a12cf4..2b0b5d3df90f 100644 --- a/src/proto_016_PtMumbai/lib_client/test/test_client_proto_contracts.ml +++ b/src/proto_016_PtMumbai/lib_client/test/test_client_proto_contracts.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe \ + -- --file test_client_proto_contracts.ml Subject: Unit tests for Client_proto_contracts *) @@ -90,9 +91,9 @@ let test_find_destination _ = let () = Alcotest_lwt.run ~__FILE__ - "tezos-lib-client-proto-contracts" + Protocol.name [ - ( Protocol.name ^ ": client_proto_contracts", + ( "client_proto_contracts", [Tztest.tztest "test_find_destination" `Quick test_find_destination] ); ] |> Lwt_main.run diff --git a/src/proto_016_PtMumbai/lib_client/test/test_michelson_v1_macros.ml b/src/proto_016_PtMumbai/lib_client/test/test_michelson_v1_macros.ml index 23bdd0b7b0cf..3fc3aab61cf7 100644 --- a/src/proto_016_PtMumbai/lib_client/test/test_michelson_v1_macros.ml +++ b/src/proto_016_PtMumbai/lib_client/test/test_michelson_v1_macros.ml @@ -27,7 +27,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe \ + -- --file test_michelson_v1_macros.ml Dependencies: src/proto_alpha/lib_client/test/assert.ml Subject: Expansion and unexpansion of Micheline terms. *) @@ -1342,6 +1343,6 @@ let wrap (n, f) = let () = Alcotest_lwt.run ~__FILE__ - "tezos-lib-client" - [(Protocol.name ^ ": micheline v1 macros", List.map wrap tests)] + Protocol.name + [("micheline v1 macros", List.map wrap tests)] |> Lwt_main.run diff --git a/src/proto_016_PtMumbai/lib_client/test/test_proxy.ml b/src/proto_016_PtMumbai/lib_client/test/test_proxy.ml index 6d46086941fd..9d9e7d428571 100644 --- a/src/proto_016_PtMumbai/lib_client/test/test_proxy.ml +++ b/src/proto_016_PtMumbai/lib_client/test/test_proxy.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_client/test/main.exe \ + -- --file test_proxy.ml Subject: Test of --mode proxy and tezos-proxy-server heuristic *) @@ -85,5 +86,5 @@ let test_split_key = let () = Alcotest.run ~__FILE__ - "tezos-lib-client-proxy" - [(Protocol.name ^ ": proxy", Qcheck2_helpers.qcheck_wrap [test_split_key])] + Protocol.name + [("proxy", Qcheck2_helpers.qcheck_wrap [test_split_key])] diff --git a/src/proto_017_PtNairob/lib_client/test/test_client_proto_context.ml b/src/proto_017_PtNairob/lib_client/test/test_client_proto_context.ml index 1437fec988b9..a2187640bc1d 100644 --- a/src/proto_017_PtNairob/lib_client/test/test_client_proto_context.ml +++ b/src/proto_017_PtNairob/lib_client/test/test_client_proto_context.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Client - Invocation: dune exec src/proto_alpha/lib_client/test/test_client_proto_context.exe + Invocation: dune exec src/proto_017_PtNairob/lib_client/test/main.exe \ + -- --file test_client_proto_context.ml Subject: Tests roundtrips of batch_transfer_operation_encoding *) @@ -65,8 +66,4 @@ let tests = (binary_roundtrip Client_proto_context.batch_transfer_operation_encoding); ] -let () = - Alcotest.run - ~__FILE__ - "Client proto context" - [(Protocol.name ^ ": Encodings", qcheck_wrap tests)] +let () = Alcotest.run ~__FILE__ Protocol.name [("Encodings", qcheck_wrap tests)] diff --git a/src/proto_017_PtNairob/lib_client/test/test_client_proto_contracts.ml b/src/proto_017_PtNairob/lib_client/test/test_client_proto_contracts.ml index 74c35ce7ce19..41be2bbb7664 100644 --- a/src/proto_017_PtNairob/lib_client/test/test_client_proto_contracts.ml +++ b/src/proto_017_PtNairob/lib_client/test/test_client_proto_contracts.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_alpha/lib_client/test/test_client_proto_contracts.exe + Invocation: dune exec src/proto_017_PtNairob/lib_client/test/main.exe \ + -- --file test_client_proto_contracts.ml Subject: Unit tests for Client_proto_contracts *) @@ -90,9 +91,9 @@ let test_find_destination _ = let () = Alcotest_lwt.run ~__FILE__ - "tezos-lib-client-proto-contracts" + Protocol.name [ - ( Protocol.name ^ ": client_proto_contracts", + ( "client_proto_contracts", [Tztest.tztest "test_find_destination" `Quick test_find_destination] ); ] |> Lwt_main.run diff --git a/src/proto_017_PtNairob/lib_client/test/test_michelson_v1_macros.ml b/src/proto_017_PtNairob/lib_client/test/test_michelson_v1_macros.ml index b6874812d00a..675def85fec9 100644 --- a/src/proto_017_PtNairob/lib_client/test/test_michelson_v1_macros.ml +++ b/src/proto_017_PtNairob/lib_client/test/test_michelson_v1_macros.ml @@ -27,7 +27,8 @@ (** Testing ------- Component: Client - Invocation: dune build @src/proto_alpha/lib_client/runtest + Invocation: dune exec src/proto_017_PtNairob/lib_client/test/main.exe \ + -- --file test_michelson_v1_macros.ml Dependencies: src/proto_alpha/lib_client/test/assert.ml Subject: Expansion and unexpansion of Micheline terms. *) @@ -1342,6 +1343,6 @@ let wrap (n, f) = let () = Alcotest_lwt.run ~__FILE__ - "tezos-lib-client" - [(Protocol.name ^ ": micheline v1 macros", List.map wrap tests)] + Protocol.name + [("micheline v1 macros", List.map wrap tests)] |> Lwt_main.run diff --git a/src/proto_017_PtNairob/lib_client/test/test_proxy.ml b/src/proto_017_PtNairob/lib_client/test/test_proxy.ml index defa5b47870e..99dc1e584eb8 100644 --- a/src/proto_017_PtNairob/lib_client/test/test_proxy.ml +++ b/src/proto_017_PtNairob/lib_client/test/test_proxy.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune build @src/proto_alpha/lib_client/runtest + Invocation: dune exec src/proto_017_PtNairob/lib_client/test/main.exe \ + -- --file test_proxy.ml Subject: Test of --mode proxy and tezos-proxy-server heuristic *) @@ -85,5 +86,5 @@ let test_split_key = let () = Alcotest.run ~__FILE__ - "tezos-lib-client-proxy" - [(Protocol.name ^ ": proxy", Qcheck2_helpers.qcheck_wrap [test_split_key])] + Protocol.name + [("proxy", Qcheck2_helpers.qcheck_wrap [test_split_key])] diff --git a/src/proto_alpha/lib_client/test/test_client_proto_context.ml b/src/proto_alpha/lib_client/test/test_client_proto_context.ml index 7351c7013307..6fd67ac7da7b 100644 --- a/src/proto_alpha/lib_client/test/test_client_proto_context.ml +++ b/src/proto_alpha/lib_client/test/test_client_proto_context.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Client - Invocation: dune exec src/proto_alpha/lib_client/test/main.exe + Invocation: dune exec src/proto_alpha/lib_client/test/main.exe \ + -- --file test_client_proto_context.ml Subject: Tests roundtrips of batch_transfer_operation_encoding *) @@ -65,8 +66,4 @@ let tests = (binary_roundtrip Client_proto_context.batch_transfer_operation_encoding); ] -let () = - Alcotest.run - ~__FILE__ - "Client proto context" - [(Protocol.name ^ ": Encodings", qcheck_wrap tests)] +let () = Alcotest.run ~__FILE__ Protocol.name [("Encodings", qcheck_wrap tests)] diff --git a/src/proto_alpha/lib_client/test/test_client_proto_contracts.ml b/src/proto_alpha/lib_client/test/test_client_proto_contracts.ml index 3112cbbe9984..025b152b9d9e 100644 --- a/src/proto_alpha/lib_client/test/test_client_proto_contracts.ml +++ b/src/proto_alpha/lib_client/test/test_client_proto_contracts.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_alpha/lib_client/test/main.exe + Invocation: dune exec src/proto_alpha/lib_client/test/main.exe \ + -- --file test_client_proto_contracts.ml Subject: Unit tests for Client_proto_contracts *) @@ -90,9 +91,9 @@ let test_find_destination _ = let () = Alcotest_lwt.run ~__FILE__ - "tezos-lib-client-proto-contracts" + Protocol.name [ - ( Protocol.name ^ ": client_proto_contracts", + ( "client_proto_contracts", [Tztest.tztest "test_find_destination" `Quick test_find_destination] ); ] |> Lwt_main.run diff --git a/src/proto_alpha/lib_client/test/test_michelson_v1_macros.ml b/src/proto_alpha/lib_client/test/test_michelson_v1_macros.ml index 8f210533c699..f8489b4e6f0c 100644 --- a/src/proto_alpha/lib_client/test/test_michelson_v1_macros.ml +++ b/src/proto_alpha/lib_client/test/test_michelson_v1_macros.ml @@ -27,7 +27,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_alpha/lib_client/test/main.exe + Invocation: dune exec src/proto_alpha/lib_client/test/main.exe \ + -- --file test_michelson_v1_macros.ml Dependencies: src/proto_alpha/lib_client/test/assert.ml Subject: Expansion and unexpansion of Micheline terms. *) @@ -1342,6 +1343,6 @@ let wrap (n, f) = let () = Alcotest_lwt.run ~__FILE__ - "tezos-lib-client" - [(Protocol.name ^ ": micheline v1 macros", List.map wrap tests)] + Protocol.name + [("micheline v1 macros", List.map wrap tests)] |> Lwt_main.run diff --git a/src/proto_alpha/lib_client/test/test_proxy.ml b/src/proto_alpha/lib_client/test/test_proxy.ml index 92fb592b0713..a7502865accc 100644 --- a/src/proto_alpha/lib_client/test/test_proxy.ml +++ b/src/proto_alpha/lib_client/test/test_proxy.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/proto_alpha/lib_client/test/main.exe + Invocation: dune exec src/proto_alpha/lib_client/test/main.exe \ + -- --file test_proxy.ml Subject: Test of --mode proxy and tezos-proxy-server heuristic *) @@ -85,5 +86,5 @@ let test_split_key = let () = Alcotest.run ~__FILE__ - "tezos-lib-client-proxy" - [(Protocol.name ^ ": proxy", Qcheck2_helpers.qcheck_wrap [test_split_key])] + Protocol.name + [("proxy", Qcheck2_helpers.qcheck_wrap [test_split_key])] -- GitLab From 553f19cbfb6fbeb28b6cfc1392e95f10234a09b0 Mon Sep 17 00:00:00 2001 From: lykimq Date: Fri, 7 Apr 2023 17:15:58 +0200 Subject: [PATCH 02/29] Alcotezt-UX: fix invocation headers, opt. titles for [lib_dal] in all protocols --- .../lib_dal/test/test_dac_pages_encoding.ml | 3 ++- .../lib_dal/test/test_dal_slot_frame_encoding.ml | 11 ++++------- .../lib_dal/test/test_dal_slot_frame_encoding.ml | 12 ++++-------- .../lib_dal/test/test_dal_slot_frame_encoding.ml | 11 ++++------- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/proto_016_PtMumbai/lib_dal/test/test_dac_pages_encoding.ml b/src/proto_016_PtMumbai/lib_dal/test/test_dac_pages_encoding.ml index 90503389264e..495556eed19a 100644 --- a/src/proto_016_PtMumbai/lib_dal/test/test_dac_pages_encoding.ml +++ b/src/proto_016_PtMumbai/lib_dal/test/test_dac_pages_encoding.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_016_PtMumbai/lib_dal/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_dal/test/main.exe \ + -- --file test_dac_pages_encoding.ml Subject: Tests for the SCORU storage module *) diff --git a/src/proto_016_PtMumbai/lib_dal/test/test_dal_slot_frame_encoding.ml b/src/proto_016_PtMumbai/lib_dal/test/test_dal_slot_frame_encoding.ml index dc1f4bad73c6..47cd36b782d7 100644 --- a/src/proto_016_PtMumbai/lib_dal/test/test_dal_slot_frame_encoding.ml +++ b/src/proto_016_PtMumbai/lib_dal/test/test_dal_slot_frame_encoding.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_016_PtMumbai/lib_dal/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_dal/test/main.exe \ + -- --file test_dal_slot_frame_encoding.ml Subject: Tests for the SCORU storage module *) @@ -414,10 +415,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Slot_framing_protocol.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Slot_framing_protocol.ml" tests] |> Lwt_main.run diff --git a/src/proto_017_PtNairob/lib_dal/test/test_dal_slot_frame_encoding.ml b/src/proto_017_PtNairob/lib_dal/test/test_dal_slot_frame_encoding.ml index 5e2d333999ae..7a5592492e0b 100644 --- a/src/proto_017_PtNairob/lib_dal/test/test_dal_slot_frame_encoding.ml +++ b/src/proto_017_PtNairob/lib_dal/test/test_dal_slot_frame_encoding.ml @@ -26,8 +26,8 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_alpha/lib_dal/test/main.exe \ - -- test "^\[Unit\] Slot_framing_protocol.ml$" + Invocation: dune exec src/proto_017_PtNairob/lib_dal/test/main.exe \ + -- --file test_dal_slot_frame_encoding.ml Subject: Tests for the SCORU storage module *) @@ -415,10 +415,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Slot_framing_protocol.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Slot_framing_protocol.ml" tests] |> Lwt_main.run diff --git a/src/proto_alpha/lib_dal/test/test_dal_slot_frame_encoding.ml b/src/proto_alpha/lib_dal/test/test_dal_slot_frame_encoding.ml index 775505cb992a..5bf82245ddf4 100644 --- a/src/proto_alpha/lib_dal/test/test_dal_slot_frame_encoding.ml +++ b/src/proto_alpha/lib_dal/test/test_dal_slot_frame_encoding.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_alpha/lib_dal/test/main.exe + Invocation: dune exec src/proto_alpha/lib_dal/test/main.exe \ + -- --file test_dal_slot_frame_encoding.ml Subject: Tests for the SCORU storage module *) @@ -414,10 +415,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Slot_framing_protocol.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Slot_framing_protocol.ml" tests] |> Lwt_main.run -- GitLab From e03a3be4a1b2fc2c9b67324eb80363ab47ba54b9 Mon Sep 17 00:00:00 2001 From: lykimq Date: Fri, 7 Apr 2023 17:19:49 +0200 Subject: [PATCH 03/29] Alcotezt-UX: fix invocation headers, opt. titles for [lib_dac_plugin] in all protocols --- .../lib_dac_plugin/test/test_dac_pages_encoding.ml | 12 ++++-------- .../test/test_dac_plugin_registration.ml | 12 ++++-------- .../lib_dac_plugin/test/test_dac_pages_encoding.ml | 11 ++++------- .../test/test_dac_plugin_registration.ml | 11 ++++------- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_pages_encoding.ml b/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_pages_encoding.ml index 5ae8080ee5cb..6370488c1ad7 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_pages_encoding.ml +++ b/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_pages_encoding.ml @@ -26,8 +26,8 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe \ - -- test "^\[Unit\] Dac_pages_encoding.ml$" + Invocation: dune exec src/proto_017_PtNairob/lib_dac_plugin/test/main.exe \ + -- --file test_dac_pages_encoding.ml Subject: Tests for the SCORU storage module *) @@ -711,10 +711,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Dac_pages_encoding.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Dac_pages_encoding.ml" tests] |> Lwt_main.run diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_plugin_registration.ml b/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_plugin_registration.ml index 24cd8de35bd1..2bf59c94fbd3 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_plugin_registration.ml +++ b/src/proto_017_PtNairob/lib_dac_plugin/test/test_dac_plugin_registration.ml @@ -26,8 +26,8 @@ (** Testing ------- Component: Lib_dac_node Dac_hash - Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe \ - -- test "^\[Unit\] Dac_plugin_registration.ml$" + Invocation: dune exec src/proto_017_PtNairob/lib_dac_plugin/test/main.exe \ + -- --file test_dac_plugin_registration.ml Subject: Tests for the interoperability between Dac hash and given protocol hash *) @@ -154,10 +154,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Dac_plugin_registration.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Dac_plugin_registration.ml" tests] |> Lwt_main.run diff --git a/src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml b/src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml index 41c2118d5037..555dff35f6e3 100644 --- a/src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml +++ b/src/proto_alpha/lib_dac_plugin/test/test_dac_pages_encoding.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Dal_node Slot_frame_encoding - Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe + Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe \ + -- --file test_dac_pages_encoding.ml Subject: Tests for the SCORU storage module *) @@ -765,10 +766,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Dac_pages_encoding.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Dac_pages_encoding.ml" tests] |> Lwt_main.run diff --git a/src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml b/src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml index cdab557320f4..a6ac7382979b 100644 --- a/src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml +++ b/src/proto_alpha/lib_dac_plugin/test/test_dac_plugin_registration.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Lib_dac_node Dac_hash - Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe + Invocation: dune exec src/proto_alpha/lib_dac_plugin/test/main.exe \ + -- --file test_dac_plugin_registration.ml Subject: Tests for the interoperability between Dac hash and given protocol hash *) @@ -153,10 +154,6 @@ let tests = let () = Alcotest_lwt.run ~__FILE__ - "protocol > unit" - [ - Test_helpers.Unit_test.spec - (Protocol.name ^ ": Dac_plugin_registration.ml") - tests; - ] + Protocol.name + [Test_helpers.Unit_test.spec "Dac_plugin_registration.ml" tests] |> Lwt_main.run -- GitLab From 00321bb797709db693322dce048d8e3e3c91d63b Mon Sep 17 00:00:00 2001 From: lykimq Date: Fri, 7 Apr 2023 17:24:12 +0200 Subject: [PATCH 04/29] Alcotezt-UX: fix invocation headers for [lib_delegate] in all protocols --- src/proto_016_PtMumbai/lib_delegate/test/test_scenario.ml | 3 ++- src/proto_017_PtNairob/lib_delegate/test/test_scenario.ml | 8 ++++++++ src/proto_alpha/lib_delegate/test/test_scenario.ml | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/proto_016_PtMumbai/lib_delegate/test/test_scenario.ml b/src/proto_016_PtMumbai/lib_delegate/test/test_scenario.ml index 3d4c86686331..385f73961bc5 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/test_scenario.ml +++ b/src/proto_016_PtMumbai/lib_delegate/test/test_scenario.ml @@ -1,7 +1,8 @@ (* Testing ------- Component: Protocol, delegate - Invocation: dune exec src/proto_016_PtMumbai/lib_delegate/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_delegate/test/main.exe \ + -- --file test_scenario.ml Subject: Test different scenario for delegate *) diff --git a/src/proto_017_PtNairob/lib_delegate/test/test_scenario.ml b/src/proto_017_PtNairob/lib_delegate/test/test_scenario.ml index ac852fe5af93..4dba31de2ef9 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/test_scenario.ml +++ b/src/proto_017_PtNairob/lib_delegate/test/test_scenario.ml @@ -1,3 +1,11 @@ +(* Testing + ------- + Component: Protocol, delegate + Invocation: dune exec src/proto_017_PtNairob/lib_delegate/test/main.exe \ + -- --file test_scenario.ml + Subject: Test different scenario for delegate +*) + open Mockup_simulator let bootstrap1 = Signature.Public_key.hash bootstrap1 diff --git a/src/proto_alpha/lib_delegate/test/test_scenario.ml b/src/proto_alpha/lib_delegate/test/test_scenario.ml index 667374a3718f..bfd1ed1b7c4d 100644 --- a/src/proto_alpha/lib_delegate/test/test_scenario.ml +++ b/src/proto_alpha/lib_delegate/test/test_scenario.ml @@ -1,7 +1,8 @@ (* Testing ------- Component: Protocol, delegate - Invocation: dune exec src/proto_alpha/lib_delegate/test/main.exe + Invocation: dune exec src/proto_alpha/lib_delegate/test/main.exe \ + -- --file test_scenario.ml Subject: Test different scenario for delegate *) -- GitLab From 0d403a7cfaeb3ed6b0a3f75d1caa7a6768fdecb7 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:13:33 +0200 Subject: [PATCH 05/29] Alcotezt-UX: fix invocation headers, opt. titles for [lib_plugin] in all protocols --- .../lib_plugin/test/test_conflict_handler.ml | 9 +++++---- .../lib_plugin/test/test_consensus_filter.ml | 12 ++++++++++-- .../lib_plugin/test/test_filter_state.ml | 10 +++++----- .../lib_plugin/test/test_plugin.ml | 7 ++++--- .../lib_plugin/test/test_conflict_handler.ml | 9 +++++---- .../lib_plugin/test/test_consensus_filter.ml | 12 ++++++++++-- .../lib_plugin/test/test_filter_state.ml | 10 +++++----- .../lib_plugin/test/test_plugin.ml | 7 ++++--- .../lib_plugin/test/test_conflict_handler.ml | 9 +++++---- .../lib_plugin/test/test_consensus_filter.ml | 12 ++++++++++-- src/proto_alpha/lib_plugin/test/test_filter_state.ml | 10 +++++----- src/proto_alpha/lib_plugin/test/test_plugin.ml | 7 ++++--- 12 files changed, 72 insertions(+), 42 deletions(-) diff --git a/src/proto_016_PtMumbai/lib_plugin/test/test_conflict_handler.ml b/src/proto_016_PtMumbai/lib_plugin/test/test_conflict_handler.ml index d1c17855c5a6..07468626b1e2 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/test_conflict_handler.ml +++ b/src/proto_016_PtMumbai/lib_plugin/test/test_conflict_handler.ml @@ -26,8 +26,9 @@ (** Testing ------- Component: Plugin.Mempool - Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe - Subject: Unit tests the Mempool.conflict_handler fonction of the plugin + Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe \ + -- --file test_conflict_handler.ml + Subject: Unit tests the Mempool.conflict_handler function of the plugin *) let pp_answer fmt = function @@ -261,9 +262,9 @@ let test_manager_ops () = let () = Alcotest_lwt.run ~__FILE__ - "conflict_handler" + Protocol.name [ - ( Protocol.name ^ ": conflict_handler", + ( "conflict_handler", [ Tztest.tztest "Random operations (not both manager)" diff --git a/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml b/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml index 1445191ab587..a476f53797bb 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml +++ b/src/proto_016_PtMumbai/lib_plugin/test/test_consensus_filter.ml @@ -23,6 +23,14 @@ (* *) (*****************************************************************************) +(** Testing + ------- + Component: Plugin.Mempool + Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe \ + -- --file test_consensus_filter.ml + Subject: Unit tests the Mempool consensus filter +*) + open Qcheck2_helpers open Plugin.Mempool open Alpha_context @@ -434,9 +442,9 @@ let test_not_acceptable_next_level = let () = Alcotest.run ~__FILE__ - "Filter" + Protocol.name [ - ( Protocol.name ^ ": pre_filter", + ( "pre_filter", qcheck_wrap [ test_acceptable_past_level; diff --git a/src/proto_016_PtMumbai/lib_plugin/test/test_filter_state.ml b/src/proto_016_PtMumbai/lib_plugin/test/test_filter_state.ml index b5e13fdb6947..ee39e877a54c 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/test_filter_state.ml +++ b/src/proto_016_PtMumbai/lib_plugin/test/test_filter_state.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Plugin) - Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe \ + -- --file test_filter_state.ml Subject: Unit tests the filter state functions of the plugin *) @@ -186,9 +187,8 @@ let test_remove_unknown = let () = Alcotest.run ~__FILE__ - "Filter_state" + Protocol.name [ - (Protocol.name ^ ": add_manager_op", qcheck_wrap [test_add_manager_op]); - ( Protocol.name ^ ": remove", - qcheck_wrap [test_remove_present; test_remove_unknown] ); + ("add_manager_op", qcheck_wrap [test_add_manager_op]); + ("remove", qcheck_wrap [test_remove_present; test_remove_unknown]); ] diff --git a/src/proto_016_PtMumbai/lib_plugin/test/test_plugin.ml b/src/proto_016_PtMumbai/lib_plugin/test/test_plugin.ml index d139236a13a3..dbb55a3ec11d 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/test_plugin.ml +++ b/src/proto_016_PtMumbai/lib_plugin/test/test_plugin.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Plugin) - Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe + Invocation: dune exec src/proto_016_PtMumbai/lib_plugin/test/main.exe \ + -- --file test_plugin.ml Subject: Unit tests the plugin *) @@ -70,9 +71,9 @@ let test_flush () = let () = Alcotest_lwt.run ~__FILE__ - "Plugin" + Protocol.name [ - ( Protocol.name ^ ": on_flush", + ( "on_flush", [ Tztest.tztest "[on_flush ~validation_state ...] yields an empty state " diff --git a/src/proto_017_PtNairob/lib_plugin/test/test_conflict_handler.ml b/src/proto_017_PtNairob/lib_plugin/test/test_conflict_handler.ml index 931dacd0a187..543acb81727d 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/test_conflict_handler.ml +++ b/src/proto_017_PtNairob/lib_plugin/test/test_conflict_handler.ml @@ -26,8 +26,9 @@ (** Testing ------- Component: Plugin.Mempool - Invocation: dune exec src/proto_alpha/lib_plugin/test/test_conflict_handler.exe - Subject: Unit tests the Mempool.conflict_handler fonction of the plugin + Invocation: dune exec src/proto_017_PtNairob/lib_plugin/test/main.exe \ + -- --file test_conflict_handler.ml + Subject: Unit tests the Mempool.conflict_handler function of the plugin *) let pp_answer fmt = function @@ -261,9 +262,9 @@ let test_manager_ops () = let () = Alcotest_lwt.run ~__FILE__ - "conflict_handler" + Protocol.name [ - ( Protocol.name ^ ": conflict_handler", + ( "conflict_handler", [ Tztest.tztest "Random operations (not both manager)" diff --git a/src/proto_017_PtNairob/lib_plugin/test/test_consensus_filter.ml b/src/proto_017_PtNairob/lib_plugin/test/test_consensus_filter.ml index 1445191ab587..0fdecad309a4 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/test_consensus_filter.ml +++ b/src/proto_017_PtNairob/lib_plugin/test/test_consensus_filter.ml @@ -23,6 +23,14 @@ (* *) (*****************************************************************************) +(** Testing + ------- + Component: Plugin.Mempool + Invocation: dune exec src/proto_017_PtNairob/lib_plugin/test/main.exe \ + -- --file test_consensus_filter.ml + Subject: Unit tests the Mempool consensus filter +*) + open Qcheck2_helpers open Plugin.Mempool open Alpha_context @@ -434,9 +442,9 @@ let test_not_acceptable_next_level = let () = Alcotest.run ~__FILE__ - "Filter" + Protocol.name [ - ( Protocol.name ^ ": pre_filter", + ( "pre_filter", qcheck_wrap [ test_acceptable_past_level; diff --git a/src/proto_017_PtNairob/lib_plugin/test/test_filter_state.ml b/src/proto_017_PtNairob/lib_plugin/test/test_filter_state.ml index f6f1baa151c5..1e0b20ee0e85 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/test_filter_state.ml +++ b/src/proto_017_PtNairob/lib_plugin/test/test_filter_state.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Plugin) - Invocation: dune exec src/proto_alpha/lib_plugin/test/test_filter_state.exe + Invocation: dune exec src/proto_017_PtNairob/lib_plugin/test/main.exe \ + -- --file test_filter_state.ml Subject: Unit tests the filter state functions of the plugin *) @@ -186,9 +187,8 @@ let test_remove_unknown = let () = Alcotest.run ~__FILE__ - "Filter_state" + Protocol.name [ - (Protocol.name ^ ": add_manager_op", qcheck_wrap [test_add_manager_op]); - ( Protocol.name ^ ": remove", - qcheck_wrap [test_remove_present; test_remove_unknown] ); + ("add_manager_op", qcheck_wrap [test_add_manager_op]); + ("remove", qcheck_wrap [test_remove_present; test_remove_unknown]); ] diff --git a/src/proto_017_PtNairob/lib_plugin/test/test_plugin.ml b/src/proto_017_PtNairob/lib_plugin/test/test_plugin.ml index 9d5e90d40a35..3da31c78ee11 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/test_plugin.ml +++ b/src/proto_017_PtNairob/lib_plugin/test/test_plugin.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Plugin) - Invocation: dune exec src/proto_alpha/lib_plugin/test/test_plugin.exe + Invocation: dune exec src/proto_017_PtNairob/lib_plugin/test/main.exe \ + -- --file test_plugin.ml Subject: Unit tests the plugin *) @@ -70,9 +71,9 @@ let test_flush () = let () = Alcotest_lwt.run ~__FILE__ - "Plugin" + Protocol.name [ - ( Protocol.name ^ ": on_flush", + ( "on_flush", [ Tztest.tztest "[on_flush ~validation_state ...] yields an empty state " diff --git a/src/proto_alpha/lib_plugin/test/test_conflict_handler.ml b/src/proto_alpha/lib_plugin/test/test_conflict_handler.ml index 7ca63242579e..02d337f40e6c 100644 --- a/src/proto_alpha/lib_plugin/test/test_conflict_handler.ml +++ b/src/proto_alpha/lib_plugin/test/test_conflict_handler.ml @@ -26,8 +26,9 @@ (** Testing ------- Component: Plugin.Mempool - Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe - Subject: Unit tests the Mempool.conflict_handler fonction of the plugin + Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe \ + -- --file test_conflict_handler.ml + Subject: Unit tests the Mempool.conflict_handler function of the plugin *) let pp_answer fmt = function @@ -261,9 +262,9 @@ let test_manager_ops () = let () = Alcotest_lwt.run ~__FILE__ - "conflict_handler" + Protocol.name [ - ( Protocol.name ^ ": conflict_handler", + ( "conflict_handler", [ Tztest.tztest "Random operations (not both manager)" diff --git a/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml b/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml index 1445191ab587..36750245d8d4 100644 --- a/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml +++ b/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml @@ -23,6 +23,14 @@ (* *) (*****************************************************************************) +(** Testing + ------- + Component: Plugin.Mempool + Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe \ + -- --file test_consensus_filter.ml + Subject: Unit tests the Mempool consensus filter +*) + open Qcheck2_helpers open Plugin.Mempool open Alpha_context @@ -434,9 +442,9 @@ let test_not_acceptable_next_level = let () = Alcotest.run ~__FILE__ - "Filter" + Protocol.name [ - ( Protocol.name ^ ": pre_filter", + ( "pre_filter", qcheck_wrap [ test_acceptable_past_level; diff --git a/src/proto_alpha/lib_plugin/test/test_filter_state.ml b/src/proto_alpha/lib_plugin/test/test_filter_state.ml index 646e8f5b37dc..4c46ac273838 100644 --- a/src/proto_alpha/lib_plugin/test/test_filter_state.ml +++ b/src/proto_alpha/lib_plugin/test/test_filter_state.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Plugin) - Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe + Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe \ + -- --file test_filter_state.ml Subject: Unit tests the filter state functions of the plugin *) @@ -186,9 +187,8 @@ let test_remove_unknown = let () = Alcotest.run ~__FILE__ - "Filter_state" + Protocol.name [ - (Protocol.name ^ ": add_manager_op", qcheck_wrap [test_add_manager_op]); - ( Protocol.name ^ ": remove", - qcheck_wrap [test_remove_present; test_remove_unknown] ); + ("add_manager_op", qcheck_wrap [test_add_manager_op]); + ("remove", qcheck_wrap [test_remove_present; test_remove_unknown]); ] diff --git a/src/proto_alpha/lib_plugin/test/test_plugin.ml b/src/proto_alpha/lib_plugin/test/test_plugin.ml index ea5fa5efdf15..6d0f89e43f85 100644 --- a/src/proto_alpha/lib_plugin/test/test_plugin.ml +++ b/src/proto_alpha/lib_plugin/test/test_plugin.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Plugin) - Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe + Invocation: dune exec src/proto_alpha/lib_plugin/test/main.exe \ + -- --file test_plugin.ml Subject: Unit tests the plugin *) @@ -70,9 +71,9 @@ let test_flush () = let () = Alcotest_lwt.run ~__FILE__ - "Plugin" + Protocol.name [ - ( Protocol.name ^ ": on_flush", + ( "on_flush", [ Tztest.tztest "[on_flush ~validation_state ...] yields an empty state " -- GitLab From 075e0546f0c43f092cdfecc70c88d5d1f74a8e99 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:16:51 +0200 Subject: [PATCH 06/29] Alcotezt-UX: fix invocation headers of [lib_base/test] --- src/lib_base/test/test_bounded.ml | 3 ++- src/lib_base/test/test_p2p_addr.ml | 3 ++- src/lib_base/test/test_protocol.ml | 3 ++- src/lib_base/test/test_sized.ml | 3 ++- src/lib_base/test/test_time.ml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib_base/test/test_bounded.ml b/src/lib_base/test/test_bounded.ml index 1851af857a95..9fdbf3f67337 100644 --- a/src/lib_base/test/test_bounded.ml +++ b/src/lib_base/test/test_bounded.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Base - Invocation: dune exec src/lib_base/test/main.exe + Invocation: dune exec src/lib_base/test/main.exe \ + -- --file test_bounded.ml Subject: Test the [Bounded] module. *) diff --git a/src/lib_base/test/test_p2p_addr.ml b/src/lib_base/test/test_p2p_addr.ml index bb5ca4265e2f..f118bebfdb04 100644 --- a/src/lib_base/test/test_p2p_addr.ml +++ b/src/lib_base/test/test_p2p_addr.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Base, P2p - Invocation: dune exec src/lib_base/test/main.exe + Invocation: dune exec src/lib_base/test/main.exe \ + -- --file test_p2p_addr.ml Subject: Check the parsing of addresses with domain names *) diff --git a/src/lib_base/test/test_protocol.ml b/src/lib_base/test/test_protocol.ml index 6794d4e2135b..b35ebfd0b531 100644 --- a/src/lib_base/test/test_protocol.ml +++ b/src/lib_base/test/test_protocol.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Base, Protocol - Invocation: dune exec src/lib_base/test/main.exe + Invocation: dune exec src/lib_base/test/main.exe \ + -- --file test_protocol.ml Subject: Check the ordering of protocol versions *) diff --git a/src/lib_base/test/test_sized.ml b/src/lib_base/test/test_sized.ml index 98f3e94a75fc..3015e63c7d61 100644 --- a/src/lib_base/test/test_sized.ml +++ b/src/lib_base/test/test_sized.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Base - Invocation: dune exec src/lib_base/test/main.exe + Invocation: dune exec src/lib_base/test/main.exe \ + -- --file test_sized.ml Subject: Check that the sized map and set functions behave correctly *) diff --git a/src/lib_base/test/test_time.ml b/src/lib_base/test/test_time.ml index 6bc737ef16df..5a190e42ac2b 100644 --- a/src/lib_base/test/test_time.ml +++ b/src/lib_base/test/test_time.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Base - Invocation: dune exec src/lib_base/test/main.exe + Invocation: dune exec src/lib_base/test/main.exe \ + -- --file test_time.ml Subject: Check that the Protocol and System times behave correctly regarding addition and encoding (binary and JSON) *) -- GitLab From 4a06b5c245eb017f3435b6007e3e6e921345defc Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:18:24 +0200 Subject: [PATCH 07/29] Alcotezt-UX: fix invocation headers of [lib_clic/test] --- src/lib_clic/test/test_clic.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_clic/test/test_clic.ml b/src/lib_clic/test/test_clic.ml index b3cfa1cb45ca..90244842ea28 100644 --- a/src/lib_clic/test/test_clic.ml +++ b/src/lib_clic/test/test_clic.ml @@ -27,7 +27,8 @@ (** Testing ------- Component: Tezos_clic library - Invocation: dune exec src/lib_clic/test/main.exe + Invocation: dune exec src/lib_clic/test/main.exe \ + -- --file test_clic.ml Subject: Test the functionality of the Tezos_clic library, such as CLI command dispatch, parameters and auto-completion. *) -- GitLab From 23c32c0ef59fde3cb4cb7c67971f3c98633bc207 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:19:37 +0200 Subject: [PATCH 08/29] Alcotezt-UX: fix invocation headers of [lib_client_base/test] --- src/lib_client_base/test/bip39_tests.ml | 3 ++- src/lib_client_base/test/pbkdf_tests.ml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib_client_base/test/bip39_tests.ml b/src/lib_client_base/test/bip39_tests.ml index 3de849df0358..b17d5b39d497 100644 --- a/src/lib_client_base/test/bip39_tests.ml +++ b/src/lib_client_base/test/bip39_tests.ml @@ -1,7 +1,8 @@ (** Testing ------- Component: Client Base - Invocation: dune exec src/lib_client_base/test/main.exe + Invocation: dune exec src/lib_client_base/test/main.exe \ + -- --file bip39_tests.ml Subject: BIP39 seed phrases. Mnemonic sentences for the generation of deterministic wallets. *) diff --git a/src/lib_client_base/test/pbkdf_tests.ml b/src/lib_client_base/test/pbkdf_tests.ml index 6180d17a004a..99b0f2b766cf 100644 --- a/src/lib_client_base/test/pbkdf_tests.ml +++ b/src/lib_client_base/test/pbkdf_tests.ml @@ -1,7 +1,8 @@ (** Testing ------- Component: Client Base - Invocation: dune exec src/lib_client_base/test/main.exe + Invocation: dune exec src/lib_client_base/test/main.exe \ + -- --file pbkdf_tests.ml Subject: On Password-Based Key Derivation Function 2 (PBKDF2) when using hash functions SHA256 and SHA512. *) -- GitLab From ad7c60b17a1a01a61683f262654183b7fbe14a0f Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:20:26 +0200 Subject: [PATCH 09/29] Alcotezt-UX: fix invocation headers of [lib_client_base_unix/test] --- src/lib_client_base_unix/test/test_mockup_wallet.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_client_base_unix/test/test_mockup_wallet.ml b/src/lib_client_base_unix/test/test_mockup_wallet.ml index a0bb0b0c9472..42a24abffd18 100644 --- a/src/lib_client_base_unix/test/test_mockup_wallet.ml +++ b/src/lib_client_base_unix/test/test_mockup_wallet.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Mockup wallet library - Invocation: dune exec src/lib_client_base_unix/test/main.exe + Invocation: dune exec src/lib_client_base_unix/test/main.exe \ + -- --file test_mockup_wallet.ml Subject: Unit tests of the Mockup wallet library *) -- GitLab From a880e3eeb3e6b64b403ec1c0575b2c04dbf9750a Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:22:38 +0200 Subject: [PATCH 10/29] Alcotezt-UX: fix invocation headers of [lib_context/test] --- src/lib_context/test/test_context.ml | 3 ++- src/lib_context/test/test_merkle_proof.ml | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib_context/test/test_context.ml b/src/lib_context/test/test_context.ml index d4d021e376da..e1ef3093c1f0 100644 --- a/src/lib_context/test/test_context.ml +++ b/src/lib_context/test/test_context.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Context - Invocation: dune exec src/lib_context/test/main.exe + Invocation: dune exec src/lib_context/test/main.exe \ + -- --file test_context.ml Subject: On context features. *) diff --git a/src/lib_context/test/test_merkle_proof.ml b/src/lib_context/test/test_merkle_proof.ml index d5e48ab35d11..229c2444ead4 100644 --- a/src/lib_context/test/test_merkle_proof.ml +++ b/src/lib_context/test/test_merkle_proof.ml @@ -23,6 +23,14 @@ (* *) (*****************************************************************************) +(* Testing + ------- + Component: Context + Invocation: dune exec src/lib_context/test/main.exe \ + -- --file test_merkle_proof.ml + Subject: Test merkle proof. +*) + open Tezos_context_disk open Context.Proof open Qcheck2_helpers -- GitLab From 16703838b74c01b893ba13efdf4a0d618534a99f Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:44:27 +0200 Subject: [PATCH 11/29] Alcotezt-UX: fix invocation headers in [lib_dac_node/test] --- manifest/main.ml | 2 +- src/lib_dac_node/test/dune | 2 +- src/lib_dac_node/test/test_data_streamer.ml | 7 ++- src/lib_dac_node/test/test_main.ml | 59 --------------------- 4 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 src/lib_dac_node/test/test_main.ml diff --git a/manifest/main.ml b/manifest/main.ml index b5f5e0d4573c..bc3eff6f4613 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -4074,7 +4074,7 @@ let octez_dac_node_lib = let _octez_dac_node_lib_tests = tezt - ["test_main"; "test_data_streamer"] + ["test_data_streamer"] ~path:"src/lib_dac_node/test" ~opam:"tezos-dac-node-lib-test" ~synopsis:"Test for dac node lib" diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune index a6aef6adf8b5..875801c6fd7f 100644 --- a/src/lib_dac_node/test/dune +++ b/src/lib_dac_node/test/dune @@ -26,7 +26,7 @@ -open Tezos_base_test_helpers -open Tezos_dac_node_lib -open Octez_alcotezt) - (modules test_main test_data_streamer)) + (modules test_data_streamer)) (executable (name main) diff --git a/src/lib_dac_node/test/test_data_streamer.ml b/src/lib_dac_node/test/test_data_streamer.ml index 1dd820cc39e7..234d66378b8e 100644 --- a/src/lib_dac_node/test/test_data_streamer.ml +++ b/src/lib_dac_node/test/test_data_streamer.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Lib_dac_node Data_streamer - Invocation: dune exec src/lib_dac_node/test/main.exe + Invocation: dune exec src/lib_dac_node/test/main.exe \ + -- --file test_data_streamer.ml Subject: Tests for the data streamer component. *) @@ -113,3 +114,7 @@ let tests = `Quick test_closing_subscriber_stream; ] + +let () = + Alcotest_lwt.run ~__FILE__ "lib_dac_node" [("Data_streamer.ml", tests)] + |> Lwt_main.run diff --git a/src/lib_dac_node/test/test_main.ml b/src/lib_dac_node/test/test_main.ml deleted file mode 100644 index f782c821362e..000000000000 --- a/src/lib_dac_node/test/test_main.ml +++ /dev/null @@ -1,59 +0,0 @@ -(*****************************************************************************) -(* *) -(* Open Source License *) -(* Copyright (c) 2023 Marigold *) -(* *) -(* Permission is hereby granted, free of charge, to any person obtaining a *) -(* copy of this software and associated documentation files (the "Software"),*) -(* to deal in the Software without restriction, including without limitation *) -(* the rights to use, copy, modify, merge, publish, distribute, sublicense, *) -(* and/or sell copies of the Software, and to permit persons to whom the *) -(* Software is furnished to do so, subject to the following conditions: *) -(* *) -(* The above copyright notice and this permission notice shall be included *) -(* in all copies or substantial portions of the Software. *) -(* *) -(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*) -(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *) -(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *) -(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*) -(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *) -(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *) -(* DEALINGS IN THE SOFTWARE. *) -(* *) -(*****************************************************************************) - -(** Testing - ------- - Component: Lib_dac_node Data_streamer - Invocation: dune exec src/lib_dac_node/test/main.exe - Subject: Tests for the data streamer component. -*) - -module Unit_test : sig - (** - * Example: [spec "Data_streamer.ml" Test_data_streamer.tests] - * Unit tests needs tag in log (like "[UNIT] some test description here...") - * This function handles such meta data *) - val spec : - string -> - unit Alcotest_lwt.test_case list -> - string * unit Alcotest_lwt.test_case list - - (** Tests with description string without [Unit] are skipped *) - val _skip : - string -> - unit Alcotest_lwt.test_case list -> - string * unit Alcotest_lwt.test_case list -end = struct - let spec unit_name test_cases = ("[Unit] " ^ unit_name, test_cases) - - let _skip unit_name test_cases = ("[SKIPPED] " ^ unit_name, test_cases) -end - -let () = - Alcotest_lwt.run - ~__FILE__ - "protocol > unit" - [Unit_test.spec "Data_streamer.ml" Test_data_streamer.tests] - |> Lwt_main.run -- GitLab From 7e42b82be943dac7b91f5af297d2626d998ff34c Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 10:58:58 +0200 Subject: [PATCH 12/29] Alcotezt-UX: fix invocation headers in [lib_error_monad/test] --- src/lib_error_monad/test/test_registration.ml | 3 ++- src/lib_error_monad/test/test_splitted_error_encoding.ml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib_error_monad/test/test_registration.ml b/src/lib_error_monad/test/test_registration.ml index 672bdfebfa3f..13b18d8fa96b 100644 --- a/src/lib_error_monad/test/test_registration.ml +++ b/src/lib_error_monad/test/test_registration.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Error Monad - Invocation: dune exec src/lib_error_monad/test/main.exe + Invocation: dune exec src/lib_error_monad/test/main.exe \ + -- --file test_registration.ml Subject: On the registration and query of errors. *) diff --git a/src/lib_error_monad/test/test_splitted_error_encoding.ml b/src/lib_error_monad/test/test_splitted_error_encoding.ml index f0f363e684b5..177185f07e4f 100644 --- a/src/lib_error_monad/test/test_splitted_error_encoding.ml +++ b/src/lib_error_monad/test/test_splitted_error_encoding.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Error Monad - Invocation: dune exec src/lib_error_monad/test/main.exe + Invocation: dune exec src/lib_error_monad/test/main.exe \ + -- --file test_splitted_error_encoding.ml Subject: On the wrapping of error_encoding in a splitted. *) -- GitLab From 69b7b3d5566db20fb08606ed929f055da32daf14 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:00:07 +0200 Subject: [PATCH 13/29] Alcotezt-UX: fix invocation headers in [lib_layer2_store/test] --- src/lib_layer2_store/test/test_indexed_store.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_layer2_store/test/test_indexed_store.ml b/src/lib_layer2_store/test/test_indexed_store.ml index f56c43002ca2..f66c15b10063 100644 --- a/src/lib_layer2_store/test/test_indexed_store.ml +++ b/src/lib_layer2_store/test/test_indexed_store.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Layer-2 indexed store - Invocation: dune exec src/lib_layer2_store/test/main.exe + Invocation: dune exec src/lib_layer2_store/test/main.exe \ + -- --file test_indexed_store.ml Subject: Test the indexed store *) -- GitLab From 21e2bbd56d85849f67586cac54b2acfff7f9b1b6 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:00:58 +0200 Subject: [PATCH 14/29] Alcotezt-UX: fix invocation headers in [lib_lazy_containers/test] --- src/lib_lazy_containers/test/chunked_byte_vector_tests.ml | 3 ++- src/lib_lazy_containers/test/lazy_vector_tests.ml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib_lazy_containers/test/chunked_byte_vector_tests.ml b/src/lib_lazy_containers/test/chunked_byte_vector_tests.ml index d6f4384d5ac8..2801652202d9 100644 --- a/src/lib_lazy_containers/test/chunked_byte_vector_tests.ml +++ b/src/lib_lazy_containers/test/chunked_byte_vector_tests.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Lazy containers - Invocation: dune exec src/lib_lazy_containers/test/main.exe + Invocation: dune exec src/lib_lazy_containers/test/main.exe \ + -- --file chunked_byte_vector_tests.ml Subject: Test chunked byte vector *) diff --git a/src/lib_lazy_containers/test/lazy_vector_tests.ml b/src/lib_lazy_containers/test/lazy_vector_tests.ml index e13e59832dc4..162aecfc299c 100644 --- a/src/lib_lazy_containers/test/lazy_vector_tests.ml +++ b/src/lib_lazy_containers/test/lazy_vector_tests.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Lazy containers - Invocation: dune exec src/lib_lazy_containers/test/main.exe + Invocation: dune exec src/lib_lazy_containers/test/main.exe \ + -- --file lazy_vector_tests.ml Subject: Test lazy vector *) -- GitLab From 5a648a47a52f269a545c2309165e4c48180451f2 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:02:08 +0200 Subject: [PATCH 15/29] Alcotezt-UX: fix invocation headers in [lib_lwt_result_stdlib/test] --- .../test/test_fuzzing_list_against_stdlib.ml | 3 ++- .../test/test_fuzzing_map_against_stdlib.ml | 3 ++- .../test/test_fuzzing_option_against_stdlib.ml | 3 ++- .../test/test_fuzzing_set_against_stdlib.ml | 3 ++- src/lib_lwt_result_stdlib/test/test_hashtbl.ml | 3 ++- src/lib_lwt_result_stdlib/test/test_list_basic.ml | 3 ++- src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml | 3 ++- src/lib_lwt_result_stdlib/test/test_seq_basic.ml | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/lib_lwt_result_stdlib/test/test_fuzzing_list_against_stdlib.ml b/src/lib_lwt_result_stdlib/test/test_fuzzing_list_against_stdlib.ml index 264ccafe1857..a31d607ea134 100644 --- a/src/lib_lwt_result_stdlib/test/test_fuzzing_list_against_stdlib.ml +++ b/src/lib_lwt_result_stdlib/test/test_fuzzing_list_against_stdlib.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_fuzzing_list_against_stdlib.ml Subject: Test fuzzing list against stdlib *) diff --git a/src/lib_lwt_result_stdlib/test/test_fuzzing_map_against_stdlib.ml b/src/lib_lwt_result_stdlib/test/test_fuzzing_map_against_stdlib.ml index 42f78ea0dd80..da35a48f5c84 100644 --- a/src/lib_lwt_result_stdlib/test/test_fuzzing_map_against_stdlib.ml +++ b/src/lib_lwt_result_stdlib/test/test_fuzzing_map_against_stdlib.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_fuzzing_map_against_stdlib.ml Subject: Test fuzzing map against stdlib *) diff --git a/src/lib_lwt_result_stdlib/test/test_fuzzing_option_against_stdlib.ml b/src/lib_lwt_result_stdlib/test/test_fuzzing_option_against_stdlib.ml index 73af1e8da7c6..f2e4a3adece0 100644 --- a/src/lib_lwt_result_stdlib/test/test_fuzzing_option_against_stdlib.ml +++ b/src/lib_lwt_result_stdlib/test/test_fuzzing_option_against_stdlib.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_fuzzing_option_against_stdlib.ml Subject: Test fuzzing option against stdlib *) diff --git a/src/lib_lwt_result_stdlib/test/test_fuzzing_set_against_stdlib.ml b/src/lib_lwt_result_stdlib/test/test_fuzzing_set_against_stdlib.ml index 9737a0430068..41b733192d39 100644 --- a/src/lib_lwt_result_stdlib/test/test_fuzzing_set_against_stdlib.ml +++ b/src/lib_lwt_result_stdlib/test/test_fuzzing_set_against_stdlib.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_fuzzing_set_against_stdlib.ml Subject: Test fuzzing set against stdlib *) diff --git a/src/lib_lwt_result_stdlib/test/test_hashtbl.ml b/src/lib_lwt_result_stdlib/test/test_hashtbl.ml index 4f16bac40df1..c74eca5a13ac 100644 --- a/src/lib_lwt_result_stdlib/test/test_hashtbl.ml +++ b/src/lib_lwt_result_stdlib/test/test_hashtbl.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_hashtbl.ml Subject: Test hashtable *) diff --git a/src/lib_lwt_result_stdlib/test/test_list_basic.ml b/src/lib_lwt_result_stdlib/test/test_list_basic.ml index 1b3e72b5ca55..8541c914497f 100644 --- a/src/lib_lwt_result_stdlib/test/test_list_basic.ml +++ b/src/lib_lwt_result_stdlib/test/test_list_basic.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_list_basic.ml Subject: Test basic properties of list *) diff --git a/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml b/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml index 9b7838850f77..32771b19daae 100644 --- a/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml +++ b/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_list_basic_lwt.ml Subject: Test basic properties of lwt list *) diff --git a/src/lib_lwt_result_stdlib/test/test_seq_basic.ml b/src/lib_lwt_result_stdlib/test/test_seq_basic.ml index 0566ace93a64..e30ad6651e66 100644 --- a/src/lib_lwt_result_stdlib/test/test_seq_basic.ml +++ b/src/lib_lwt_result_stdlib/test/test_seq_basic.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Stdlib - Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe + Invocation: dune exec src/lib_lwt_result_stdlib/test/main.exe \ + -- --file test_seq_basic.ml Subject: Test basic properties of sequence *) -- GitLab From b907a55216022c9e7c294408aca9853e90c8c0d6 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:03:40 +0200 Subject: [PATCH 16/29] Alcotezt-UX: fix invocation headers in [lib_mockup/test] --- src/lib_mockup/test/test_fuzzing_mockup_args.ml | 3 ++- src/lib_mockup/test/test_mockup_args.ml | 3 ++- src/lib_mockup/test/test_persistence.ml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib_mockup/test/test_fuzzing_mockup_args.ml b/src/lib_mockup/test/test_fuzzing_mockup_args.ml index d756013e1bf2..8d477740f218 100644 --- a/src/lib_mockup/test/test_fuzzing_mockup_args.ml +++ b/src/lib_mockup/test/test_fuzzing_mockup_args.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Mockup args library - Invocation: dune exec src/lib_mockup/test/main.exe + Invocation: dune exec src/lib_mockup/test/main.exe \ + -- --file test_fuzzing_mockup_args.ml Subject: Fuzzing tests of the Mockup args library *) diff --git a/src/lib_mockup/test/test_mockup_args.ml b/src/lib_mockup/test/test_mockup_args.ml index 5f318860327f..a904d1361c5a 100644 --- a/src/lib_mockup/test/test_mockup_args.ml +++ b/src/lib_mockup/test/test_mockup_args.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Mockup args library - Invocation: dune exec src/lib_mockup/test/main.exe + Invocation: dune exec src/lib_mockup/test/main.exe \ + -- --file test_mockup_args.ml Subject: Unit tests of the Mockup args library *) diff --git a/src/lib_mockup/test/test_persistence.ml b/src/lib_mockup/test/test_persistence.ml index f2c6f0e411b6..b801b37b9e3e 100644 --- a/src/lib_mockup/test/test_persistence.ml +++ b/src/lib_mockup/test/test_persistence.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Persistence library - Invocation: dune exec src/lib_mockup/test/main.exe + Invocation: dune exec src/lib_mockup/test/main.exe \ + -- --file test_persistence.ml Subject: Unit tests of the Persistence library *) -- GitLab From e937c6e135c67ec495bca2bbfeebba591ec390aa Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:04:44 +0200 Subject: [PATCH 17/29] Alcotezt-UX: fix invocation headers in [lib_proxy/test] --- src/lib_proxy/test/test_fuzzing_light.ml | 3 ++- src/lib_proxy/test/test_fuzzing_proxy_getter.ml | 3 ++- src/lib_proxy/test/test_light.ml | 3 ++- src/lib_proxy/test/test_proxy.ml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib_proxy/test/test_fuzzing_light.ml b/src/lib_proxy/test/test_fuzzing_light.ml index b9c51ddbd758..aed9ed3c38a5 100644 --- a/src/lib_proxy/test/test_fuzzing_light.ml +++ b/src/lib_proxy/test/test_fuzzing_light.ml @@ -27,7 +27,8 @@ ------- Component: Client - Invocation: dune exec src/lib_proxy/test/main.exe + Invocation: dune exec src/lib_proxy/test/main.exe \ + -- --file test_fuzzing_light.ml Dependencies: src/lib_proxy/test/light_lib.ml src/lib_proxy/test/test_light.ml Description: Most generators in this module are recursive / nested, hence diff --git a/src/lib_proxy/test/test_fuzzing_proxy_getter.ml b/src/lib_proxy/test/test_fuzzing_proxy_getter.ml index 7b3ed337778f..177b395aa44f 100644 --- a/src/lib_proxy/test/test_fuzzing_proxy_getter.ml +++ b/src/lib_proxy/test/test_fuzzing_proxy_getter.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Proxy getter - Invocation: dune exec src/lib_proxy/test/main.exe + Invocation: dune exec src/lib_proxy/test/main.exe \ + -- --file test_fuzzing_proxy_getter.ml Subject: Fuzzing tests of internals of the client's --mode proxy *) diff --git a/src/lib_proxy/test/test_light.ml b/src/lib_proxy/test/test_light.ml index 98aec452be85..52437eec1487 100644 --- a/src/lib_proxy/test/test_light.ml +++ b/src/lib_proxy/test/test_light.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/lib_proxy/test/main.exe + Invocation: dune exec src/lib_proxy/test/main.exe \ + -- --file test_light.ml Dependencies: src/lib_proxy/test/light_lib.ml *) diff --git a/src/lib_proxy/test/test_proxy.ml b/src/lib_proxy/test/test_proxy.ml index 0520eb2f3e22..99e76dc5a0c6 100644 --- a/src/lib_proxy/test/test_proxy.ml +++ b/src/lib_proxy/test/test_proxy.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Client - Invocation: dune exec src/lib_proxy/test/main.exe + Invocation: dune exec src/lib_proxy/test/main.exe \ + -- --file test_proxy.ml Subject: --mode proxy of the client *) -- GitLab From b4ca9b2197480f297785d4ba0ada1627b9edf7eb Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:05:34 +0200 Subject: [PATCH 18/29] Alcotezt-UX: fix invocation headers in [lib_requester/test] --- src/lib_requester/test/test_fuzzing_requester.ml | 3 ++- src/lib_requester/test/test_requester.ml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib_requester/test/test_fuzzing_requester.ml b/src/lib_requester/test/test_fuzzing_requester.ml index 59178c0ec78f..f9991d6ac19c 100644 --- a/src/lib_requester/test/test_fuzzing_requester.ml +++ b/src/lib_requester/test/test_fuzzing_requester.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Requester - Invocation: dune exec src/lib_requester/test/main.exe + Invocation: dune exec src/lib_requester/test/main.exe \ + -- --file test_fuzzing_requester.ml Subject: Relations between functions of [Requester]'s API *) diff --git a/src/lib_requester/test/test_requester.ml b/src/lib_requester/test/test_requester.ml index 0fc339227e90..97cee6580483 100644 --- a/src/lib_requester/test/test_requester.ml +++ b/src/lib_requester/test/test_requester.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Requester - Invocation: dune exec src/lib_requester/test/main.exe + Invocation: dune exec src/lib_requester/test/main.exe \ + -- --file test_requester.ml Subject: Basic behaviors of the API for generic resource fetching/requesting service. Instantiating the [Requester] functor with simple mocks. -- GitLab From fef77296c1d68d86339299fa98b95c4808bcd31d Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:11:59 +0200 Subject: [PATCH 19/29] Alcotezt-UX: fix invocation headers in [lib_shell/test] --- manifest/main.ml | 1 - src/lib_shell/test/dune | 1 - .../test/test_consensus_heuristic.ml | 10 +++- src/lib_shell/test/test_node.ml | 7 ++- src/lib_shell/test/test_peer_validator.ml | 14 +++++- src/lib_shell/test/test_prevalidation.ml | 3 +- .../test/test_prevalidator_classification.ml | 3 +- ..._prevalidator_classification_operations.ml | 3 +- .../test_prevalidator_pending_operations.ml | 3 +- src/lib_shell/test/test_protocol_validator.ml | 7 ++- src/lib_shell/test/test_shell.ml | 48 ------------------- src/lib_shell/test/test_shell_operation.ml | 3 +- .../test/test_synchronisation_heuristic.ml | 13 ++++- .../test_synchronisation_heuristic_fuzzy.ml | 3 +- src/lib_shell/test/test_validator.ml | 7 ++- 15 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 src/lib_shell/test/test_shell.ml diff --git a/manifest/main.ml b/manifest/main.ml index bc3eff6f4613..773fed793d3f 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -6582,7 +6582,6 @@ let _octez_shell_tests = "test_prevalidator_classification_operations"; "test_prevalidator_pending_operations"; "test_protocol_validator"; - "test_shell"; "test_shell_operation"; "test_synchronisation_heuristic"; "test_synchronisation_heuristic_fuzzy"; diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 8bf2e9828ee3..5c22cfd320bd 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -59,7 +59,6 @@ test_prevalidator_classification_operations test_prevalidator_pending_operations test_protocol_validator - test_shell test_shell_operation test_synchronisation_heuristic test_synchronisation_heuristic_fuzzy diff --git a/src/lib_shell/test/test_consensus_heuristic.ml b/src/lib_shell/test/test_consensus_heuristic.ml index 3c4831bc3eb3..b35629ca6212 100644 --- a/src/lib_shell/test/test_consensus_heuristic.ml +++ b/src/lib_shell/test/test_consensus_heuristic.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Shell - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_consensus_heuristic.ml Subject: Test the consensus heuristic *) @@ -374,3 +375,10 @@ let tests_lwt = List.map (fun (s, f) -> Alcotest_lwt.test_case s `Quick f) tests_worker_lwt_raw + +let () = + Alcotest_lwt.run + ~__FILE__ + "tezos-shell" + [("consensus heuristic sync", tests); ("consensus heuristic", tests_lwt)] + |> Lwt_main.run diff --git a/src/lib_shell/test/test_node.ml b/src/lib_shell/test/test_node.ml index b2d664f614c7..53e356ff51a6 100644 --- a/src/lib_shell/test/test_node.ml +++ b/src/lib_shell/test/test_node.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Node) - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_node.ml Dependencies: src/lib_shell/test/shell_test_helpers.ml Subject: Unit tests for node. Currently only tests that events are emitted. @@ -231,3 +232,7 @@ let tests = `Quick (wrap node_initialization_events); ] + +let () = + Alcotest_lwt.run ~__FILE__ "tezos-shell" [("test node", tests)] + |> Lwt_main.run diff --git a/src/lib_shell/test/test_peer_validator.ml b/src/lib_shell/test/test_peer_validator.ml index f26fd5153614..65a559241d81 100644 --- a/src/lib_shell/test/test_peer_validator.ml +++ b/src/lib_shell/test/test_peer_validator.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Peer_validator - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_peer_validator.ml Subject: Unit tests for [Peer_validator] *) @@ -93,7 +94,16 @@ let wrap chain_db Tezos_crypto.Crypto_box.Public_key_hash.zero in - f chain_db genesis_header pv) + let* () = + Lwt.finalize + (fun () -> f chain_db genesis_header pv) + (fun () -> + let*! () = Peer_validator.shutdown pv in + let*! () = Block_validator_process.close block_validator_processs in + let*! () = Block_validator.shutdown block_validator in + unit) + in + return_unit) (* This test ensure that [validate_new_head hash header] remove all entries of [hash] in the db if the fitness does not increase. *) diff --git a/src/lib_shell/test/test_prevalidation.ml b/src/lib_shell/test/test_prevalidation.ml index 4cbbf7477bef..954b210c2858 100644 --- a/src/lib_shell/test/test_prevalidation.ml +++ b/src/lib_shell/test/test_prevalidation.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Prevalidation - Invocation: dune exec src/lib_shell/test/main.exe -- -f test_prevalidation.ml + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_prevalidation.ml Subject: Unit tests for {!Prevalidation.T} *) diff --git a/src/lib_shell/test/test_prevalidator_classification.ml b/src/lib_shell/test/test_prevalidator_classification.ml index 546423b22dc1..75d2c5cda676 100644 --- a/src/lib_shell/test/test_prevalidator_classification.ml +++ b/src/lib_shell/test/test_prevalidator_classification.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Prevalidator classification) - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_prevalidator_classification.ml Subject: Unit tests the Prevalidator classification APIs *) diff --git a/src/lib_shell/test/test_prevalidator_classification_operations.ml b/src/lib_shell/test/test_prevalidator_classification_operations.ml index 4abbd3a724a7..cceef8758444 100644 --- a/src/lib_shell/test/test_prevalidator_classification_operations.ml +++ b/src/lib_shell/test/test_prevalidator_classification_operations.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Prevalidator) - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_prevalidator_classification_operations.ml Subject: Unit tests [Prevalidator_classification.Internal_for_tests.handle_live_operations] and [Prevalidator_classification.recyle_operations] *) diff --git a/src/lib_shell/test/test_prevalidator_pending_operations.ml b/src/lib_shell/test/test_prevalidator_pending_operations.ml index edddc7e32821..1336bf734c25 100644 --- a/src/lib_shell/test/test_prevalidator_pending_operations.ml +++ b/src/lib_shell/test/test_prevalidator_pending_operations.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Prevalidator pending operations) - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_prevalidator_pending_operations.ml Subject: Unit tests the Prevalidator pending operations APIs *) diff --git a/src/lib_shell/test/test_protocol_validator.ml b/src/lib_shell/test/test_protocol_validator.ml index 7110853a4ae0..6292f9f74228 100644 --- a/src/lib_shell/test/test_protocol_validator.ml +++ b/src/lib_shell/test/test_protocol_validator.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_protocol_validator.ml Subject: Unit tests for protocol_validator. Currently only tests that events are emitted. *) @@ -182,3 +183,7 @@ let tests = `Quick (wrap test_fetching_protocol); ] + +let () = + Alcotest_lwt.run ~__FILE__ "tezos-shell" [("test validator", tests)] + |> Lwt_main.run diff --git a/src/lib_shell/test/test_shell.ml b/src/lib_shell/test/test_shell.ml deleted file mode 100644 index 23bfeedc37d9..000000000000 --- a/src/lib_shell/test/test_shell.ml +++ /dev/null @@ -1,48 +0,0 @@ -(*****************************************************************************) -(* *) -(* Open Source License *) -(* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) -(* Copyright (c) 2020 Nomadic Labs *) -(* *) -(* Permission is hereby granted, free of charge, to any person obtaining a *) -(* copy of this software and associated documentation files (the "Software"),*) -(* to deal in the Software without restriction, including without limitation *) -(* the rights to use, copy, modify, merge, publish, distribute, sublicense, *) -(* and/or sell copies of the Software, and to permit persons to whom the *) -(* Software is furnished to do so, subject to the following conditions: *) -(* *) -(* The above copyright notice and this permission notice shall be included *) -(* in all copies or substantial portions of the Software. *) -(* *) -(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*) -(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *) -(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *) -(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*) -(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *) -(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *) -(* DEALINGS IN THE SOFTWARE. *) -(* *) -(*****************************************************************************) - -(** Testing - ------- - Component: Shell - Invocation: dune exec src/lib_shell/test/main.exe - Subject: Entrypoint of tests, delegates to other files in the - enclosing directory. -*) - -let () = - Alcotest_lwt.run - ~__FILE__ - "tezos-shell" - [ - ("synchronisation heuristic sync", Test_synchronisation_heuristic.tests); - ("synchronisation heuristic", Test_synchronisation_heuristic.tests_lwt); - ("consensus heuristic sync", Test_consensus_heuristic.tests); - ("consensus heuristic", Test_consensus_heuristic.tests_lwt); - ("test protocol validator", Test_protocol_validator.tests); - ("test validator", Test_validator.tests); - ("test node", Test_node.tests); - ] - |> Lwt_main.run diff --git a/src/lib_shell/test/test_shell_operation.ml b/src/lib_shell/test/test_shell_operation.ml index c375cadf9faa..455451eab6ee 100644 --- a/src/lib_shell/test/test_shell_operation.ml +++ b/src/lib_shell/test/test_shell_operation.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell_operation and others - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_shell_operation.ml Subject: Unit tests for [Shell_operation], and for other components e.g. [Requester] when the tests rely on the operation representation provided by diff --git a/src/lib_shell/test/test_synchronisation_heuristic.ml b/src/lib_shell/test/test_synchronisation_heuristic.ml index edba7f9f0e55..8734baa64a06 100644 --- a/src/lib_shell/test/test_synchronisation_heuristic.ml +++ b/src/lib_shell/test/test_synchronisation_heuristic.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Shell - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_synchronisation_heuristic.ml Subject: Test the synchronisation heuristic *) @@ -688,3 +689,13 @@ let tests_lwt_raw : (string * (Lwt_switch.t -> unit -> unit Lwt.t)) list = let tests_lwt = List.map (fun (s, f) -> Alcotest_lwt.test_case s `Quick f) tests_lwt_raw + +let () = + Alcotest_lwt.run + ~__FILE__ + "tezos-shell" + [ + ("synchronisation heuristic sync", tests); + ("synchronisation heuristic ", tests_lwt); + ] + |> Lwt_main.run diff --git a/src/lib_shell/test/test_synchronisation_heuristic_fuzzy.ml b/src/lib_shell/test/test_synchronisation_heuristic_fuzzy.ml index 2d10e704d093..1960fa0653f5 100644 --- a/src/lib_shell/test/test_synchronisation_heuristic_fuzzy.ml +++ b/src/lib_shell/test/test_synchronisation_heuristic_fuzzy.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Shell - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_synchronisation_heuristic_fuzzy.ml Subject: Test the synchronisation heuristic with a reference implementation *) diff --git a/src/lib_shell/test/test_validator.ml b/src/lib_shell/test/test_validator.ml index 17f8cf4532c0..c9cb5797e67d 100644 --- a/src/lib_shell/test/test_validator.ml +++ b/src/lib_shell/test/test_validator.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Shell (Validator) - Invocation: dune exec src/lib_shell/test/main.exe + Invocation: dune exec src/lib_shell/test/main.exe \ + -- --file test_validator.ml Subject: Unit tests for validator. Currently only tests that events are emitted. *) @@ -148,3 +149,7 @@ let validator_events validator block_validator chain _switch () = let tests = [Alcotest_lwt.test_case "validator_events" `Quick (wrap validator_events)] + +let () = + Alcotest_lwt.run ~__FILE__ "tezos-shell" [("test validator", tests)] + |> Lwt_main.run -- GitLab From 41f8b57f1aba0b41886a2234753bc7435f6245c7 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:12:52 +0200 Subject: [PATCH 20/29] Alcotezt-UX: fix invocation headers in [lib_shell_services/test] --- src/lib_shell_services/test/test_block_services.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_shell_services/test/test_block_services.ml b/src/lib_shell_services/test/test_block_services.ml index cdda08153084..26ed894f6a62 100644 --- a/src/lib_shell_services/test/test_block_services.ml +++ b/src/lib_shell_services/test/test_block_services.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Block_services - Invocation: dune exec src/lib_shell_services/test/main.exe + Invocation: dune exec src/lib_shell_services/test/main.exe \ + -- --file test_block_services.ml Subject: Unit tests for [Block_services] *) -- GitLab From 8b0bf0b585d7d7186cbbf83e3e2e127ba90bbde4 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:13:50 +0200 Subject: [PATCH 21/29] Alcotezt-UX: fix invocation headers in [lib_signer_backends/test] --- src/lib_signer_backends/test/test_encrypted.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_signer_backends/test/test_encrypted.ml b/src/lib_signer_backends/test/test_encrypted.ml index 7aa58b9806d4..fa04352eaf5c 100644 --- a/src/lib_signer_backends/test/test_encrypted.ml +++ b/src/lib_signer_backends/test/test_encrypted.ml @@ -10,7 +10,8 @@ (** Testing ------- Component: Remote-signature Backends - Invocation: dune exec src/lib_signer_backends/test/main.exe + Invocation: dune exec src/lib_signer_backends/test/main.exe \ + -- --file test_encrypted.ml Subject: On secret keys and URIs. *) -- GitLab From 9ba6d4b31247ebd9de0e76758a3ecd645a838059 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:16:01 +0200 Subject: [PATCH 22/29] Alcotezt-UX: fix invocation headers in [lib_stdlib] --- src/lib_stdlib/test-unix/test_circular_buffer.ml | 3 ++- src/lib_stdlib/test-unix/test_circular_buffer_fuzzy.ml | 3 ++- src/lib_stdlib/test-unix/test_hash_queue_lwt.ml | 8 ++++++++ src/lib_stdlib/test-unix/test_lwt_pipe.ml | 3 ++- src/lib_stdlib/test/test_bits.ml | 3 ++- src/lib_stdlib/test/test_fallbackArray.ml | 3 ++- src/lib_stdlib/test/test_functionalArray.ml | 3 ++- src/lib_stdlib/test/test_tzBytes.ml | 3 ++- 8 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/lib_stdlib/test-unix/test_circular_buffer.ml b/src/lib_stdlib/test-unix/test_circular_buffer.ml index c5e86a93ebb3..5d033a2a9c16 100644 --- a/src/lib_stdlib/test-unix/test_circular_buffer.ml +++ b/src/lib_stdlib/test-unix/test_circular_buffer.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: stdlib - Invocation: dune exec src/lib_stdlib/test-unix/main.exe + Invocation: dune exec src/lib_stdlib/test-unix/main.exe \ + -- --file test_circular_buffer.ml Subject: On circular buffer *) diff --git a/src/lib_stdlib/test-unix/test_circular_buffer_fuzzy.ml b/src/lib_stdlib/test-unix/test_circular_buffer_fuzzy.ml index b6d748673bf6..7b9a45f24a6c 100644 --- a/src/lib_stdlib/test-unix/test_circular_buffer_fuzzy.ml +++ b/src/lib_stdlib/test-unix/test_circular_buffer_fuzzy.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: stdlib - Invocation: dune exec src/lib_stdlib/test-unix/main.exe + Invocation: dune exec src/lib_stdlib/test-unix/main.exe \ + -- --file test_circular_buffer_fuzzy.ml Subject: Test the circular buffer with a reference implementation *) diff --git a/src/lib_stdlib/test-unix/test_hash_queue_lwt.ml b/src/lib_stdlib/test-unix/test_hash_queue_lwt.ml index bb0ad371f89c..a8f0a61d0966 100644 --- a/src/lib_stdlib/test-unix/test_hash_queue_lwt.ml +++ b/src/lib_stdlib/test-unix/test_hash_queue_lwt.ml @@ -23,6 +23,14 @@ (* *) (*****************************************************************************) +(** Testing + ------- + Component: Stdlib + Invocation: dune exec src/lib_stdlib/test-unix/main.exe \ + -- --file test_hash_queue_lwt.ml + Subject: Hash_queue +*) + module String = struct include String diff --git a/src/lib_stdlib/test-unix/test_lwt_pipe.ml b/src/lib_stdlib/test-unix/test_lwt_pipe.ml index 1692c803a8cc..ddba8b380927 100644 --- a/src/lib_stdlib/test-unix/test_lwt_pipe.ml +++ b/src/lib_stdlib/test-unix/test_lwt_pipe.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Stdlib - Invocation: dune exec src/lib_stdlib/test-unix/main.exe + Invocation: dune exec src/lib_stdlib/test-unix/main.exe \ + -- --file test_lwt_pipe.ml Subject: Lwt_pipe *) diff --git a/src/lib_stdlib/test/test_bits.ml b/src/lib_stdlib/test/test_bits.ml index 3622ddf84a03..e9bc9bb3d7ef 100644 --- a/src/lib_stdlib/test/test_bits.ml +++ b/src/lib_stdlib/test/test_bits.ml @@ -28,7 +28,8 @@ open Utils.Infix (** Testing ------- Component: stdlib - Invocation: dune exec src/lib_stdlib/test/main.exe + Invocation: dune exec src/lib_stdlib/test/main.exe \ + -- --file test_bits.ml Subject: On fast numbits implementation *) diff --git a/src/lib_stdlib/test/test_fallbackArray.ml b/src/lib_stdlib/test/test_fallbackArray.ml index 53f5d8199fd6..753a069b2a7a 100644 --- a/src/lib_stdlib/test/test_fallbackArray.ml +++ b/src/lib_stdlib/test/test_fallbackArray.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: stdlib - Invocation: dune exec src/lib_stdlib/test/main.exe + Invocation: dune exec src/lib_stdlib/test/main.exe \ + -- --file test_fallbackArray.ml Subject: Fallback arrays *) diff --git a/src/lib_stdlib/test/test_functionalArray.ml b/src/lib_stdlib/test/test_functionalArray.ml index 3da44b2a7923..567da45a1255 100644 --- a/src/lib_stdlib/test/test_functionalArray.ml +++ b/src/lib_stdlib/test/test_functionalArray.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: stdlib - Invocation: dune exec src/lib_stdlib/test/main.exe + Invocation: dune exec src/lib_stdlib/test/main.exe \ + -- --file test_functionalArray.ml Subject: Functional arrays *) diff --git a/src/lib_stdlib/test/test_tzBytes.ml b/src/lib_stdlib/test/test_tzBytes.ml index 146768905215..fe1b7c17f2ec 100644 --- a/src/lib_stdlib/test/test_tzBytes.ml +++ b/src/lib_stdlib/test/test_tzBytes.ml @@ -26,7 +26,8 @@ (** Testing _______ - Invocation: dune exec src/lib_stdlib/test/main.exe + Invocation: dune exec src/lib_stdlib/test/main.exe \ + -- --file test_tzBytes.ml Subject: Bitwise byte operation and Bytes <=> nat/int conversion *) -- GitLab From e65a8da10f3eab5053b3eeeafbf97be469a8ee11 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:16:50 +0200 Subject: [PATCH 23/29] Alcotezt-UX: fix invocation headers in [lib_stdlib_unix] --- src/lib_stdlib_unix/test/test_key_value_store_fuzzy.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_stdlib_unix/test/test_key_value_store_fuzzy.ml b/src/lib_stdlib_unix/test/test_key_value_store_fuzzy.ml index 1a972cbd34ca..55610cf563a6 100644 --- a/src/lib_stdlib_unix/test/test_key_value_store_fuzzy.ml +++ b/src/lib_stdlib_unix/test/test_key_value_store_fuzzy.ml @@ -26,7 +26,8 @@ (* Testing ------- Component: Key-value store - Invocation: dune exec src/lib_store_common/unix/test/test_key_value_store_fuzzy.exe + Invocation: dune exec src/lib_stdlib_unix/test/main.exe \ + -- --file test_key_value_store_fuzzy.ml Subject: Test the key-value store *) -- GitLab From 736f018204a6cecbb7429717e3d2a4fb0177bb9c Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:28:47 +0200 Subject: [PATCH 24/29] Alcotezt-UX: fix invocation headers in [lib_tree_encoding/test] --- manifest/main.ml | 2 +- src/lib_tree_encoding/test/dune | 2 +- src/lib_tree_encoding/test/test_encoding.ml | 7 +++- src/lib_tree_encoding/test/test_proofs.ml | 7 +++- .../test/test_tree_encoding.ml | 38 ------------------- 5 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 src/lib_tree_encoding/test/test_tree_encoding.ml diff --git a/manifest/main.ml b/manifest/main.ml index 773fed793d3f..62ee4ea2a07b 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2590,7 +2590,7 @@ let octez_context_disk = let _tree_encoding_tests = tezt - ["test_tree_encoding"; "test_proofs"; "test_encoding"] + ["test_proofs"; "test_encoding"] ~path:"src/lib_tree_encoding/test" ~opam:"tezos-tree-encoding-test" ~synopsis:"Tests for the tree encoding library" diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index 33e6d45fe544..abd279788ad3 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -24,7 +24,7 @@ -open Tezos_base_test_helpers -open Tezos_test_helpers -open Octez_alcotezt) - (modules test_tree_encoding test_proofs test_encoding)) + (modules test_proofs test_encoding)) (executable (name main) diff --git a/src/lib_tree_encoding/test/test_encoding.ml b/src/lib_tree_encoding/test/test_encoding.ml index e6b743632a8e..1d361e35e1d8 100644 --- a/src/lib_tree_encoding/test/test_encoding.ml +++ b/src/lib_tree_encoding/test/test_encoding.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Tree_encoding - Invocation: dune exec src/lib_tree_encoding/test/main.exe + Invocation: dune exec src/lib_tree_encoding/test/main.exe \ + -- --file test_encoding.ml Subject: Encoding tests for the tree-encoding library *) @@ -575,3 +576,7 @@ let tests = tztest "Swap maps" `Quick test_swap_maps; tztest "Swap vectors" `Quick test_swap_vectors; ] + +let () = + Alcotest_lwt.run ~__FILE__ "test lib tree encoding" [("Encodings", tests)] + |> Lwt_main.run diff --git a/src/lib_tree_encoding/test/test_proofs.ml b/src/lib_tree_encoding/test/test_proofs.ml index 2951f452bd0d..f8a544302eb4 100644 --- a/src/lib_tree_encoding/test/test_proofs.ml +++ b/src/lib_tree_encoding/test/test_proofs.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Tree_encoding - Invocation: dune exec src/lib_tree_encoding/test/main.exe + Invocation: dune exec src/lib_tree_encoding/test/main.exe \ + -- --file test_proofs.ml Subject: Proof-related tests for the tree-encoding library *) @@ -230,3 +231,7 @@ let tests = tztest "Decode, set, and move subtree" `Quick test_move_and_read_subtrees; tztest "Copy subtrees" `Quick test_copy_subtrees; ] + +let () = + Alcotest_lwt.run ~__FILE__ "test lib tree encoding" [("Proofs", tests)] + |> Lwt_main.run diff --git a/src/lib_tree_encoding/test/test_tree_encoding.ml b/src/lib_tree_encoding/test/test_tree_encoding.ml deleted file mode 100644 index 4459db8b92e7..000000000000 --- a/src/lib_tree_encoding/test/test_tree_encoding.ml +++ /dev/null @@ -1,38 +0,0 @@ -(*****************************************************************************) -(* *) -(* Open Source License *) -(* Copyright (c) 2022 Trili Tech *) -(* *) -(* Permission is hereby granted, free of charge, to any person obtaining a *) -(* copy of this software and associated documentation files (the "Software"),*) -(* to deal in the Software without restriction, including without limitation *) -(* the rights to use, copy, modify, merge, publish, distribute, sublicense, *) -(* and/or sell copies of the Software, and to permit persons to whom the *) -(* Software is furnished to do so, subject to the following conditions: *) -(* *) -(* The above copyright notice and this permission notice shall be included *) -(* in all copies or substantial portions of the Software. *) -(* *) -(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*) -(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *) -(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *) -(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*) -(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *) -(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *) -(* DEALINGS IN THE SOFTWARE. *) -(* *) -(*****************************************************************************) - -(** Testing - ------- - Component: Lib_tree_encoding - Invocation: dune exec src/lib_tree_encoding/test/main.exe - Subject: Tests for the tree-encoding library -*) - -let () = - Alcotest_lwt.run - ~__FILE__ - "test lib tree encoding" - [("Encodings", Test_encoding.tests); ("Proofs", Test_proofs.tests)] - |> Lwt_main.run -- GitLab From 040626f59c62ae58dfe7fd3b01341f8a679ed4bc Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:29:40 +0200 Subject: [PATCH 25/29] Alcotezt-UX: fix invocation headers in [lib_version/test] --- src/lib_version/test/test_parser.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_version/test/test_parser.ml b/src/lib_version/test/test_parser.ml index b9fcc0c42d01..142391b5e5c1 100644 --- a/src/lib_version/test/test_parser.ml +++ b/src/lib_version/test/test_parser.ml @@ -26,7 +26,8 @@ (** Testing _______ Component: lib_version - Invocation: dune exec src/lib_version/test/main.exe + Invocation: dune exec src/lib_version/test/main.exe \ + -- --file test_parser.ml Subject: Test versions parser *) -- GitLab From 638d1b2aca5bfd55bc70906ae39dbadac9a27026 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:30:32 +0200 Subject: [PATCH 26/29] Alcotezt-UX: fix invocation headers in [lib_webassembly] --- src/lib_webassembly/tests/smallint.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_webassembly/tests/smallint.ml b/src/lib_webassembly/tests/smallint.ml index 91c0eee074b1..4d35afcaa528 100644 --- a/src/lib_webassembly/tests/smallint.ml +++ b/src/lib_webassembly/tests/smallint.ml @@ -1,7 +1,8 @@ (* Testing ------- Component: WebAssembly - Invocation: dune exec src/lib_webassembly/tests/main.exe + Invocation: dune exec src/lib_webassembly/tests/main.exe \ + -- --file smallint.ml Subject: Test small ints *) -- GitLab From bc179662e9ebce3a20a435968c2c8dd27fee8666 Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:31:11 +0200 Subject: [PATCH 27/29] Alcotezt-UX: fix invocation headers in [lib_workers] --- src/lib_workers/test/test_workers_unit.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_workers/test/test_workers_unit.ml b/src/lib_workers/test/test_workers_unit.ml index 8409dda9b0d0..4e3727778b53 100644 --- a/src/lib_workers/test/test_workers_unit.ml +++ b/src/lib_workers/test/test_workers_unit.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: Workers - Invocation: dune exec src/lib_workers/test/main.exe + Invocation: dune exec src/lib_workers/test/main.exe \ + -- --file test_workers_unit.ml Subject: Unit tests for [Worker] *) -- GitLab From a18f23b0c357cc3296eccf968edd76b3b59ab0ce Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:34:35 +0200 Subject: [PATCH 28/29] Alcotezt-UX: fix invocation headers in [lib_rpc_http] --- src/lib_rpc_http/test/test_rpc_http.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_rpc_http/test/test_rpc_http.ml b/src/lib_rpc_http/test/test_rpc_http.ml index d5fef0fbff28..3fc7e7e3b09f 100644 --- a/src/lib_rpc_http/test/test_rpc_http.ml +++ b/src/lib_rpc_http/test/test_rpc_http.ml @@ -26,7 +26,8 @@ (** Testing ------- Component: RPC-HTTP - Invocation: dune exec src/lib_rpc_http/test/main.exe + Invocation: dune exec src/lib_rpc_http/test/main.exe \ + -- --file test_rpc_http.ml Subject: Basic unit tests for HTTP server running RPC services. These tests concern themselves mainly with ACL feature -- GitLab From 90a2ba1e7d0d34fe7c3b83fa4e4f639df05d3d8f Mon Sep 17 00:00:00 2001 From: lykimq Date: Tue, 11 Apr 2023 11:36:16 +0200 Subject: [PATCH 29/29] Alcotezt-UX: fix invocation headers in [lib_proxy_server_config] --- src/lib_proxy_server_config/test/test_proxy_server_config.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_proxy_server_config/test/test_proxy_server_config.ml b/src/lib_proxy_server_config/test/test_proxy_server_config.ml index 753679c3e869..493dfafd6d19 100644 --- a/src/lib_proxy_server_config/test/test_proxy_server_config.ml +++ b/src/lib_proxy_server_config/test/test_proxy_server_config.ml @@ -27,7 +27,8 @@ ------- Component: Client - Invocation: dune exec src/lib_proxy_server_config/test/main.exe + Invocation: dune exec src/lib_proxy_server_config/test/main.exe \ + -- --file test_proxy_server_config.ml Description: Test various functions and types regarding the configuration of [tezos-proxy-server] *) -- GitLab