From e037c758a8b0e91a68beb18f454b31b224c1c599 Mon Sep 17 00:00:00 2001 From: lykimq Date: Fri, 17 Feb 2023 19:17:30 +0100 Subject: [PATCH] Alcotezt: port [src/proto_alpha/lib_dac/test] --- manifest/main.ml | 10 ++++-- opam/tezos-dac-alpha.opam | 4 ++- src/proto_alpha/lib_dac/test/dune | 34 ++++++++++++++----- .../lib_dac/test/test_dac_pages_encoding.ml | 10 ++++++ .../test/test_dac_plugin_registration.ml | 10 ++++++ .../lib_dac/test/{main.ml => test_helpers.ml} | 11 ------ tezt/tests/dune | 1 + 7 files changed, 57 insertions(+), 23 deletions(-) rename src/proto_alpha/lib_dac/test/{main.ml => test_helpers.ml} (90%) diff --git a/manifest/main.ml b/manifest/main.ml index 8346214a4798..da7177a204d9 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -5417,8 +5417,12 @@ module Protocol = Protocol in let _dac_tests = only_if (active && N.(number >= 017)) @@ fun () -> - test - "main" + tezt + [ + "test_dac_pages_encoding"; + "test_dac_plugin_registration"; + "test_helpers"; + ] ~path:(path // "lib_dac/test") ~with_macos_security_framework:true ~opam:(sf "tezos-dac-%s" name_dash) @@ -5431,7 +5435,7 @@ module Protocol = Protocol octez_base_test_helpers |> open_; test_helpers |> if_some |> open_; octez_dac_node_lib |> open_; - alcotest_lwt; + alcotezt; ] in let benchmark_type_inference = diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam index e5feb6cfd0a8..45a93126106e 100644 --- a/opam/tezos-dac-alpha.opam +++ b/opam/tezos-dac-alpha.opam @@ -18,13 +18,15 @@ depends: [ "tezos-client-alpha" "tezos-embedded-protocol-alpha" "tezos-protocol-alpha" + "tezt" { with-test & >= "3.0.0" } "tezos-base-test-helpers" {with-test} "tezos-alpha-test-helpers" {with-test} - "alcotest-lwt" { with-test & >= "1.5.0" } + "octez-alcotezt" {with-test} ] build: [ ["rm" "-r" "vendors"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "@runtezt" "-p" name "-j" jobs] {with-test} ] synopsis: "Tezos/Protocol: protocol specific library for the Data availability Committee" diff --git a/src/proto_alpha/lib_dac/test/dune b/src/proto_alpha/lib_dac/test/dune index 1240a9a3b367..b34a34f0c213 100644 --- a/src/proto_alpha/lib_dac/test/dune +++ b/src/proto_alpha/lib_dac/test/dune @@ -1,30 +1,48 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name main) +(library + (name src_proto_alpha_lib_dac_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-dac-alpha tezos-protocol-alpha tezos-base-test-helpers tezos-alpha-test-helpers tezos_dac_node_lib - alcotest-lwt) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + octez-alcotezt) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_dac_alpha -open Tezos_protocol_alpha -open Tezos_base_test_helpers -open Tezos_alpha_test_helpers - -open Tezos_dac_node_lib)) + -open Tezos_dac_node_lib + -open Octez_alcotezt) + (modules test_dac_pages_encoding test_dac_plugin_registration test_helpers)) + +(executable + (name main) + (libraries + src_proto_alpha_lib_dac_test_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-dac-alpha) (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml b/src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml index 96ca5be40023..ba59af8cfb55 100644 --- a/src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml +++ b/src/proto_alpha/lib_dac/test/test_dac_pages_encoding.ml @@ -617,3 +617,13 @@ let tests = Hash_chain.V0.test_serialize; Merkle_tree.V0.PBT.serialization_roundtrip_pbt; ] + +let () = + Alcotest_lwt.run + "protocol > unit" + [ + Test_helpers.Unit_test.spec + (Protocol.name ^ ": Dac_pages_encoding.ml") + tests; + ] + |> Lwt_main.run diff --git a/src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml b/src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml index 23bb2973723d..20a414457447 100644 --- a/src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml +++ b/src/proto_alpha/lib_dac/test/test_dac_plugin_registration.ml @@ -150,3 +150,13 @@ let tests = `Quick test_dac_hash_hash_string_with_reveal_hash; ] + +let () = + Alcotest_lwt.run + "protocol > unit" + [ + Test_helpers.Unit_test.spec + (Protocol.name ^ ": Dac_plugin_registration.ml") + tests; + ] + |> Lwt_main.run diff --git a/src/proto_alpha/lib_dac/test/main.ml b/src/proto_alpha/lib_dac/test/test_helpers.ml similarity index 90% rename from src/proto_alpha/lib_dac/test/main.ml rename to src/proto_alpha/lib_dac/test/test_helpers.ml index b326558332d5..832d0dd725a9 100644 --- a/src/proto_alpha/lib_dac/test/main.ml +++ b/src/proto_alpha/lib_dac/test/test_helpers.ml @@ -43,14 +43,3 @@ end = struct let _skip unit_name test_cases = ("[SKIPPED] " ^ unit_name, test_cases) end - -let () = - Alcotest_lwt.run - "protocol > unit" - [ - Unit_test.spec "Dac_pages_encoding.ml" Test_dac_pages_encoding.tests; - Unit_test.spec - "Dac_plugin_registration.ml" - Test_dac_plugin_registration.tests; - ] - |> Lwt_main.run diff --git a/tezt/tests/dune b/tezt/tests/dune index 343df28cd513..4baeeaf5c45f 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -23,6 +23,7 @@ src_proto_alpha_lib_plugin_test_tezt_lib src_proto_alpha_lib_delegate_test_tezt_lib src_proto_alpha_lib_dal_test_tezt_lib + src_proto_alpha_lib_dac_test_tezt_lib src_proto_alpha_lib_client_test_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_unit_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_regression_tezt_lib -- GitLab