diff --git a/manifest/main.ml b/manifest/main.ml index f507ef3d50d71107fe21f17dec2978d16dc05ed3..794fb8e84f1fa3a3bd382ccd1970bd4c662fef46 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -2729,8 +2729,8 @@ let octez_rpc_http_server = ~modules:["RPC_server"; "RPC_middleware"] let _octez_rpc_http_server_tests = - test - "test_rpc_http" + tezt + ["test_rpc_http"] ~path:"src/lib_rpc_http/test" ~opam:"tezos-rpc-http-server" ~deps: @@ -2743,7 +2743,7 @@ let _octez_rpc_http_server_tests = octez_base_test_helpers |> open_; octez_rpc_http_server |> open_; qcheck_alcotest; - alcotest_lwt; + alcotezt; ] let octez_client_base = diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam index ae270bee3757c06fe72dc538e31d6f57d4459b04..499b7cf14cfa5467bc93d91c7fbe43243df862d6 100644 --- a/opam/tezos-rpc-http-server.opam +++ b/opam/tezos-rpc-http-server.opam @@ -16,15 +16,17 @@ depends: [ "resto-acl" { >= "1.0" } "tezos-rpc" "tezos-rpc-http" + "tezt" { with-test & >= "3.0.0" } "tezos-stdlib" {with-test} "tezos-test-helpers" {with-test} "tezos-base-test-helpers" {with-test} "qcheck-alcotest" { with-test & >= "0.20" } - "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: library of auto-documented RPCs (http server)" diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune index 415d3b6506f820a2545bac61e49f3d547f7f94fc..e434ac4a4dca36d4ef4c25da57a552b973149cc4 100644 --- a/src/lib_rpc_http/test/dune +++ b/src/lib_rpc_http/test/dune @@ -1,9 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executable - (name test_rpc_http) +(library + (name src_lib_rpc_http_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-base.unix tezos-stdlib @@ -12,16 +14,32 @@ tezos-base-test-helpers tezos-rpc-http-server 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_stdlib -open Tezos_test_helpers -open Tezos_base_test_helpers - -open Tezos_rpc_http_server)) + -open Tezos_rpc_http_server + -open Octez_alcotezt) + (modules test_rpc_http)) + +(executable + (name main) + (libraries + src_lib_rpc_http_test_tezt_lib + tezt) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-rpc-http-server) - (action (run %{dep:./test_rpc_http.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 7395cf36dcc1ba77d87289fbca1a490c17c572d4..7722d90473d3d3c0ddd43ec0ada457363bdfbfc9 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -50,6 +50,7 @@ src_lib_shell_services_test_tezt_lib src_lib_shell_test_tezt_lib src_lib_sapling_test_tezt_lib + src_lib_rpc_http_test_tezt_lib src_lib_requester_test_tezt_lib src_lib_proxy_server_config_test_tezt_lib src_lib_p2p_tezt_tezt_lib