From 89b5c0ccea3e53a5d851ccf481a686069ae612f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Fri, 3 Mar 2023 17:46:38 +0100 Subject: [PATCH 1/2] Packaging,Test: move shell-services-test-helpers to proxy --- .gitlab/ci/jobs/packaging/opam_package.yml | 9 +------ dune-project | 1 - manifest/main.ml | 18 ++++++------- opam/tezos-proxy.opam | 8 +++--- opam/tezos-shell-services-test-helpers.opam | 26 ------------------- src/lib_proxy/test/dune | 2 +- src/lib_proxy/test/test_fuzzing_light.ml | 2 +- .../test/test_fuzzing_proxy_getter.ml | 2 +- .../test_helpers/shell_services}/dune | 3 +-- .../test_helpers/shell_services}/test/dune | 4 +-- .../test/test_block_services.ml | 2 +- .../test_helpers_shell_services.ml} | 0 .../test_helpers_shell_services.mli} | 0 13 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 opam/tezos-shell-services-test-helpers.opam rename src/{lib_shell_services/test_helpers => lib_proxy/test_helpers/shell_services}/dune (79%) rename src/{lib_shell_services/test_helpers => lib_proxy/test_helpers/shell_services}/test/dune (83%) rename src/{lib_shell_services/test_helpers => lib_proxy/test_helpers/shell_services}/test/test_block_services.ml (97%) rename src/{lib_shell_services/test_helpers/shell_services_test_helpers.ml => lib_proxy/test_helpers/shell_services/test_helpers_shell_services.ml} (100%) rename src/{lib_shell_services/test_helpers/shell_services_test_helpers.mli => lib_proxy/test_helpers/shell_services/test_helpers_shell_services.mli} (100%) diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 214e0fc9b657..bf4f4dad2bf8 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -1417,13 +1417,6 @@ opam:tezos-shell-services: variables: package: tezos-shell-services -opam:tezos-shell-services-test-helpers: - extends: - - .opam_template - - .rules_template__trigger_opam_batch_6 - variables: - package: tezos-shell-services-test-helpers - opam:tezos-signer-backends: extends: - .opam_template @@ -1554,7 +1547,7 @@ opam:tezos-webassembly-interpreter-extra: opam:tezos-workers: extends: - .opam_template - - .rules_template__trigger_opam_batch_7 + - .rules_template__trigger_opam_batch_6 variables: package: tezos-workers diff --git a/dune-project b/dune-project index 8e384b2bb441..88619fa0f3ad 100644 --- a/dune-project +++ b/dune-project @@ -212,7 +212,6 @@ (package (name tezos-shell-context)) (package (name tezos-shell-context-test)(allow_empty)) (package (name tezos-shell-services)) -(package (name tezos-shell-services-test-helpers)) (package (name tezos-signer-backends)) (package (name tezos-signer-services)) (package (name tezos-smart-rollup-016-PtMumbai)) diff --git a/manifest/main.ml b/manifest/main.ml index 4db36ce390cc..c19a427480f6 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2995,11 +2995,11 @@ let octez_proxy_rpc = uri; ] -let octez_shell_services_test_helpers = - public_lib - "tezos-shell-services-test-helpers" - ~path:"src/lib_shell_services/test_helpers" - ~synopsis:"Tezos: Tezos shell_services test helpers" +let octez_proxy_test_helpers_shell_services = + private_lib + "tezos_proxy_test_helpers_shell_services" + ~path:"src/lib_proxy/test_helpers/shell_services" + ~opam:"" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3015,15 +3015,15 @@ let octez_shell_services_test_helpers = let _octez_shell_service_test_helpers_tests = test "test_block_services" - ~path:"src/lib_shell_services/test_helpers/test" - ~opam:"tezos-shell-services-test-helpers" + ~path:"src/lib_proxy/test_helpers/shell_services/test" + ~opam:"tezos-proxy" ~deps: [ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_test_helpers |> open_; octez_shell_services; - octez_shell_services_test_helpers; + octez_proxy_test_helpers_shell_services; qcheck_alcotest; alcotest_lwt; ] @@ -3047,7 +3047,7 @@ let _octez_proxy_tests = octez_proxy; octez_base_test_helpers |> open_; octez_test_helpers |> open_; - octez_shell_services_test_helpers; + octez_proxy_test_helpers_shell_services; qcheck_alcotest; alcotest_lwt; uri; diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index 4579c0e5dc6e..720f4fff08c9 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -21,12 +21,12 @@ depends: [ "tezos-context" "uri" { >= "3.1.0" } "tezos-mockup-proxy" - "tezos-stdlib-unix" {with-test} - "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} - "tezos-shell-services-test-helpers" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } + "qcheck-core" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } + "qcheck-alcotest" { with-test & >= "0.20" } + "tezos-stdlib-unix" {with-test} + "tezos-base-test-helpers" {with-test} ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-shell-services-test-helpers.opam b/opam/tezos-shell-services-test-helpers.opam deleted file mode 100644 index b9fdfd33ce22..000000000000 --- a/opam/tezos-shell-services-test-helpers.opam +++ /dev/null @@ -1,26 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "tezos-base" - "tezos-shell-services" - "tezos-test-helpers" - "qcheck-core" - "tezos-context" - "alcotest-lwt" { >= "1.5.0" } - "qcheck-alcotest" { with-test & >= "0.20" } -] -build: [ - ["rm" "-r" "vendors"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: Tezos shell_services test helpers" diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index 124fbe6f55ed..e987ea40fdbe 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -10,7 +10,7 @@ tezos-proxy tezos-base-test-helpers tezos-test-helpers - tezos-shell-services-test-helpers + tezos_proxy_test_helpers_shell_services qcheck-alcotest alcotest-lwt uri) diff --git a/src/lib_proxy/test/test_fuzzing_light.ml b/src/lib_proxy/test/test_fuzzing_light.ml index f6d73299da9d..5fd24dfbd137 100644 --- a/src/lib_proxy/test/test_fuzzing_light.ml +++ b/src/lib_proxy/test/test_fuzzing_light.ml @@ -38,7 +38,7 @@ module Store = Tezos_context_memory.Context module Proof = Tezos_context_sigs.Context.Proof_types open Qcheck2_helpers -open Tezos_shell_services_test_helpers.Shell_services_test_helpers +open Tezos_proxy_test_helpers_shell_services.Test_helpers_shell_services module Consensus = struct let chain, block = (`Main, `Head 0) diff --git a/src/lib_proxy/test/test_fuzzing_proxy_getter.ml b/src/lib_proxy/test/test_fuzzing_proxy_getter.ml index b5ddfc65018d..2889f9918281 100644 --- a/src/lib_proxy/test/test_fuzzing_proxy_getter.ml +++ b/src/lib_proxy/test/test_fuzzing_proxy_getter.ml @@ -35,7 +35,7 @@ module Proxy_getter = Tezos_proxy.Proxy_getter module Tree = Proxy_getter.Internal.Tree open Qcheck2_helpers -open Tezos_shell_services_test_helpers.Shell_services_test_helpers +open Tezos_proxy_test_helpers_shell_services.Test_helpers_shell_services let key_gen = (* Using small_list, otherwise the test takes considerably longer. diff --git a/src/lib_shell_services/test_helpers/dune b/src/lib_proxy/test_helpers/shell_services/dune similarity index 79% rename from src/lib_shell_services/test_helpers/dune rename to src/lib_proxy/test_helpers/shell_services/dune index 58b0180ee5a5..092e3264bfb3 100644 --- a/src/lib_shell_services/test_helpers/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -2,8 +2,7 @@ ; Edit file manifest/main.ml instead. (library - (name tezos_shell_services_test_helpers) - (public_name tezos-shell-services-test-helpers) + (name tezos_proxy_test_helpers_shell_services) (libraries tezos-base tezos-shell-services diff --git a/src/lib_shell_services/test_helpers/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune similarity index 83% rename from src/lib_shell_services/test_helpers/test/dune rename to src/lib_proxy/test_helpers/shell_services/test/dune index 48e60c51dcf4..1e5f4cbd9709 100644 --- a/src/lib_shell_services/test_helpers/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -8,7 +8,7 @@ tezos-base.unix tezos-test-helpers tezos-shell-services - tezos-shell-services-test-helpers + tezos_proxy_test_helpers_shell_services qcheck-alcotest alcotest-lwt) (flags @@ -18,5 +18,5 @@ (rule (alias runtest) - (package tezos-shell-services-test-helpers) + (package tezos-proxy) (action (run %{dep:./test_block_services.exe}))) diff --git a/src/lib_shell_services/test_helpers/test/test_block_services.ml b/src/lib_proxy/test_helpers/shell_services/test/test_block_services.ml similarity index 97% rename from src/lib_shell_services/test_helpers/test/test_block_services.ml rename to src/lib_proxy/test_helpers/shell_services/test/test_block_services.ml index acb0914b9471..d95da07791d2 100644 --- a/src/lib_shell_services/test_helpers/test/test_block_services.ml +++ b/src/lib_proxy/test_helpers/shell_services/test/test_block_services.ml @@ -32,7 +32,7 @@ open Qcheck2_helpers -open Tezos_shell_services_test_helpers.Shell_services_test_helpers +open Tezos_proxy_test_helpers_shell_services.Test_helpers_shell_services open Tezos_context_sigs.Context.Proof_types.Internal_for_tests diff --git a/src/lib_shell_services/test_helpers/shell_services_test_helpers.ml b/src/lib_proxy/test_helpers/shell_services/test_helpers_shell_services.ml similarity index 100% rename from src/lib_shell_services/test_helpers/shell_services_test_helpers.ml rename to src/lib_proxy/test_helpers/shell_services/test_helpers_shell_services.ml diff --git a/src/lib_shell_services/test_helpers/shell_services_test_helpers.mli b/src/lib_proxy/test_helpers/shell_services/test_helpers_shell_services.mli similarity index 100% rename from src/lib_shell_services/test_helpers/shell_services_test_helpers.mli rename to src/lib_proxy/test_helpers/shell_services/test_helpers_shell_services.mli -- GitLab From 602e1327c5f3ebdf2269dcf8d70ca54e44e4208f Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 8 Feb 2023 16:18:02 +0100 Subject: [PATCH 2/2] lib_proxy: move tests to alcotezt --- .gitlab/ci/jobs/packaging/opam_package.yml | 4 +- manifest/main.ml | 15 +++--- opam/tezos-proxy.opam | 9 ++-- src/lib_proxy/test/dune | 51 ++++++++++--------- src/lib_proxy/test/test_proxy.ml | 2 +- .../test_helpers/shell_services/dune | 6 ++- .../test_helpers/shell_services/test/dune | 29 ++++++++--- tezt/tests/dune | 2 + 8 files changed, 74 insertions(+), 44 deletions(-) diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index bf4f4dad2bf8..3fbadea4c06d 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -1519,7 +1519,7 @@ opam:tezos-validation: opam:tezos-version: extends: - .opam_template - - .rules_template__trigger_opam_batch_7 + - .rules_template__trigger_opam_batch_6 variables: package: tezos-version @@ -1547,7 +1547,7 @@ opam:tezos-webassembly-interpreter-extra: opam:tezos-workers: extends: - .opam_template - - .rules_template__trigger_opam_batch_6 + - .rules_template__trigger_opam_batch_7 variables: package: tezos-workers diff --git a/manifest/main.ml b/manifest/main.ml index c19a427480f6..d96046e6704e 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3007,14 +3007,16 @@ let octez_proxy_test_helpers_shell_services = octez_test_helpers |> open_; qcheck_core; octez_context_memory; - alcotest_lwt; + lwt_unix; + alcotezt; ] ~bisect_ppx:false ~linkall:true + ~release_status:Released let _octez_shell_service_test_helpers_tests = - test - "test_block_services" + tezt + ["test_block_services"] ~path:"src/lib_proxy/test_helpers/shell_services/test" ~opam:"tezos-proxy" ~deps: @@ -3025,16 +3027,17 @@ let _octez_shell_service_test_helpers_tests = octez_shell_services; octez_proxy_test_helpers_shell_services; qcheck_alcotest; - alcotest_lwt; + alcotezt; ] let _octez_proxy_tests = - tests + tezt [ "test_proxy"; "test_fuzzing_proxy_getter"; "test_light"; "test_fuzzing_light"; + "light_lib"; ] ~path:"src/lib_proxy/test" ~with_macos_security_framework:true @@ -3049,7 +3052,7 @@ let _octez_proxy_tests = octez_test_helpers |> open_; octez_proxy_test_helpers_shell_services; qcheck_alcotest; - alcotest_lwt; + alcotezt; uri; ] diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index 720f4fff08c9..11ff7a266a99 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -21,16 +21,19 @@ depends: [ "tezos-context" "uri" { >= "3.1.0" } "tezos-mockup-proxy" + "tezt" { with-test & >= "3.0.0" } + "tezos-stdlib-unix" {with-test} + "tezos-base-test-helpers" {with-test} "tezos-test-helpers" {with-test} "qcheck-core" {with-test} - "alcotest-lwt" { with-test & >= "1.5.0" } + "lwt" { with-test & >= "5.6.0" } + "octez-alcotezt" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-stdlib-unix" {with-test} - "tezos-base-test-helpers" {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: proxy" diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index e987ea40fdbe..88ff62485ba2 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -1,9 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executables - (names test_proxy test_fuzzing_proxy_getter test_light test_fuzzing_light) +(library + (name src_lib_proxy_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-base.unix tezos-stdlib-unix @@ -12,33 +14,36 @@ tezos-test-helpers tezos_proxy_test_helpers_shell_services qcheck-alcotest - alcotest-lwt + octez-alcotezt uri) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base -open Tezos_base.TzPervasives -open Tezos_base_test_helpers - -open Tezos_test_helpers)) + -open Tezos_test_helpers + -open Octez_alcotezt) + (modules + test_proxy + test_fuzzing_proxy_getter + test_light + test_fuzzing_light + light_lib)) -(rule - (alias runtest) - (package tezos-proxy) - (action (run %{dep:./test_proxy.exe}))) - -(rule - (alias runtest) - (package tezos-proxy) - (action (run %{dep:./test_fuzzing_proxy_getter.exe}))) +(executable + (name main) + (libraries + src_lib_proxy_test_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) -(rule - (alias runtest) - (package tezos-proxy) - (action (run %{dep:./test_light.exe}))) +(rule (alias runtezt) (package tezos-proxy) (action (run %{dep:./main.exe}))) (rule - (alias runtest) - (package tezos-proxy) - (action (run %{dep:./test_fuzzing_light.exe}))) + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/lib_proxy/test/test_proxy.ml b/src/lib_proxy/test/test_proxy.ml index 2d7a4e2ddbc8..32d3de00896d 100644 --- a/src/lib_proxy/test/test_proxy.ml +++ b/src/lib_proxy/test/test_proxy.ml @@ -234,7 +234,7 @@ let () = Alcotest_lwt.run "tezos-proxy" [ - ( "all", + ( "all tests", [ Alcotest_lwt.test_case "RequestsTree" `Quick test_tree; Tztest.tztest "test do_rpc" `Quick test_do_rpc_no_longer_key; diff --git a/src/lib_proxy/test_helpers/shell_services/dune b/src/lib_proxy/test_helpers/shell_services/dune index 092e3264bfb3..5cfc0eff4a8f 100644 --- a/src/lib_proxy/test_helpers/shell_services/dune +++ b/src/lib_proxy/test_helpers/shell_services/dune @@ -9,9 +9,11 @@ tezos-test-helpers qcheck-core tezos-context.memory - alcotest-lwt) + lwt.unix + octez-alcotezt) (library_flags (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives - -open Tezos_test_helpers)) + -open Tezos_test_helpers + -open Octez_alcotezt)) diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index 1e5f4cbd9709..040abbda9ca6 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -1,22 +1,37 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name test_block_services) +(library + (name src_lib_proxy_test_helpers_shell_services_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-base.unix tezos-test-helpers tezos-shell-services tezos_proxy_test_helpers_shell_services qcheck-alcotest - alcotest-lwt) + octez-alcotezt) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base -open Tezos_base.TzPervasives - -open Tezos_test_helpers)) + -open Tezos_test_helpers + -open Octez_alcotezt) + (modules test_block_services)) + +(executable + (name main) + (libraries + src_lib_proxy_test_helpers_shell_services_test_tezt_lib + tezt) + (modules main)) + +(rule (alias runtezt) (package tezos-proxy) (action (run %{dep:./main.exe}))) (rule - (alias runtest) - (package tezos-proxy) - (action (run %{dep:./test_block_services.exe}))) + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/tezt/tests/dune b/tezt/tests/dune index d0323aafdf13..f7da14044a1a 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -68,6 +68,8 @@ src_lib_rpc_http_test_tezt_lib src_lib_requester_test_tezt_lib src_lib_proxy_server_config_test_tezt_lib + src_lib_proxy_test_helpers_shell_services_test_tezt_lib + src_lib_proxy_test_tezt_lib src_lib_protocol_environment_test_shell_context_tezt_lib src_lib_protocol_environment_test_tezt_lib src_lib_p2p_tezt_tezt_lib -- GitLab