From 3d03fc049096971df83aecefdcb842f307045a51 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 22 Feb 2023 17:04:10 +0100 Subject: [PATCH 1/3] lib_signer_backends: fix typo in test title --- src/lib_signer_backends/unix/test/test_crouching.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_signer_backends/unix/test/test_crouching.ml b/src/lib_signer_backends/unix/test/test_crouching.ml index adf2f67ea895..76754ddd8f55 100644 --- a/src/lib_signer_backends/unix/test/test_crouching.ml +++ b/src/lib_signer_backends/unix/test/test_crouching.ml @@ -16,4 +16,4 @@ let test_example () = let tests = [Alcotest.test_case "print_example" `Quick test_example] -let () = Alcotest.run "tezos-signed-backends" [("ledger-names", tests)] +let () = Alcotest.run "tezos-signer-backends" [("ledger-names", tests)] -- GitLab From 9513d0eca342013ce8c09c428cee0ecb1a3e2db7 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 22 Feb 2023 17:05:17 +0100 Subject: [PATCH 2/3] lib_signer_backends/test: convert to alcotezt --- manifest/main.ml | 6 +++--- opam/tezos-signer-backends.opam | 9 +++++--- src/lib_signer_backends/test/dune | 36 +++++++++++++++++++++++-------- tezt/tests/dune | 1 + 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index c67a4804f8ef..eb160c7555b6 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2804,8 +2804,8 @@ let octez_signer_backends = ] let _octez_signer_backends_tests = - test - "test_encrypted" + tezt + ["test_encrypted"] ~path:"src/lib_signer_backends/test" ~opam:"tezos-signer-backends" ~with_macos_security_framework:true @@ -2818,7 +2818,7 @@ let _octez_signer_backends_tests = octez_crypto; octez_client_base |> open_; octez_signer_backends |> open_; - alcotest_lwt; + alcotezt; uri; ] diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index b5d6be435bd2..cfb6dd08650c 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -18,14 +18,16 @@ depends: [ "tezos-signer-services" "tezos-shell-services" "uri" { >= "3.1.0" } - "tezos-error-monad" {with-test} - "tezos-crypto" {with-test} - "alcotest-lwt" { with-test & >= "1.5.0" } "ocplib-endian" "fmt" { >= "0.8.7" } "tezos-clic" "tezos-stdlib-unix" "tezos-rpc-http-client-unix" + "tezos-error-monad" {with-test} + "tezos-crypto" {with-test} + "alcotest-lwt" { with-test & >= "1.5.0" } + "tezt" { with-test & >= "3.0.0" } + "octez-alcotezt" {with-test} ] depopts: [ "ledgerwallet-tezos" @@ -37,5 +39,6 @@ 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: remote-signature backends for `tezos-client`" diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index d0496d1629d5..f6bfb9417596 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -1,9 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name test_encrypted) +(library + (name src_lib_signer_backends_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-base.unix tezos-stdlib @@ -11,20 +13,36 @@ tezos-crypto tezos-client-base tezos-signer-backends - 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_stdlib -open Tezos_error_monad -open Tezos_error_monad.TzLwtreslib -open Tezos_client_base - -open Tezos_signer_backends)) + -open Tezos_signer_backends + -open Octez_alcotezt) + (modules test_encrypted)) + +(executable + (name main) + (libraries + src_lib_signer_backends_test_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-signer-backends) - (action (run %{dep:./test_encrypted.exe}))) + (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/tezt/tests/dune b/tezt/tests/dune index 244222bd10c4..fe148bb7969c 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -23,6 +23,7 @@ src_lib_stdlib_unix_test__tezt_lib src_lib_stdlib_test_unix_tezt_lib src_lib_stdlib_test_tezt_lib + src_lib_signer_backends_test_tezt_lib src_lib_p2p_tezt_tezt_lib src_lib_mockup_test_tezt_lib src_lib_lwt_result_stdlib_test_tezt_lib -- GitLab From b53daf9478b55d2826353f26281a333ae3bd0a3f Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 22 Feb 2023 17:06:14 +0100 Subject: [PATCH 3/3] lib_signer_backends/unix/test: convert to alcotezt --- manifest/main.ml | 6 ++--- opam/tezos-signer-backends.opam | 3 +-- src/lib_signer_backends/unix/test/dune | 36 +++++++++++++++++++------- tezt/tests/dune | 1 + 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index eb160c7555b6..f5409335f0f5 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2851,8 +2851,8 @@ let octez_signer_backends_unix = ] let _octez_signer_backends_unix_tests = - test - "test_crouching" + tezt + ["test_crouching"] ~path:"src/lib_signer_backends/unix/test" ~opam:"tezos-signer-backends" ~with_macos_security_framework:true @@ -2863,7 +2863,7 @@ let _octez_signer_backends_unix_tests = octez_crypto; octez_client_base |> open_; octez_signer_backends_unix |> open_; - alcotest_lwt; + alcotezt; ] let octez_client_commands = diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index cfb6dd08650c..f2c926df0900 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -23,10 +23,9 @@ depends: [ "tezos-clic" "tezos-stdlib-unix" "tezos-rpc-http-client-unix" + "tezt" { with-test & >= "3.0.0" } "tezos-error-monad" {with-test} "tezos-crypto" {with-test} - "alcotest-lwt" { with-test & >= "1.5.0" } - "tezt" { with-test & >= "3.0.0" } "octez-alcotezt" {with-test} ] depopts: [ diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index c5a8b13de2ff..279c7f3456cd 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -1,26 +1,44 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name test_crouching) +(library + (name src_lib_signer_backends_unix_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-error-monad tezos-stdlib tezos-crypto tezos-client-base tezos-signer-backends.unix - 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_error_monad -open Tezos_stdlib -open Tezos_client_base - -open Tezos_signer_backends_unix)) + -open Tezos_signer_backends_unix + -open Octez_alcotezt) + (modules test_crouching)) + +(executable + (name main) + (libraries + src_lib_signer_backends_unix_test_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-signer-backends) - (action (run %{dep:./test_crouching.exe}))) + (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/tezt/tests/dune b/tezt/tests/dune index fe148bb7969c..c0efb967297d 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -23,6 +23,7 @@ src_lib_stdlib_unix_test__tezt_lib src_lib_stdlib_test_unix_tezt_lib src_lib_stdlib_test_tezt_lib + src_lib_signer_backends_unix_test_tezt_lib src_lib_signer_backends_test_tezt_lib src_lib_p2p_tezt_tezt_lib src_lib_mockup_test_tezt_lib -- GitLab