From f67a30d8d692bf566c08101fffef1dece3cdcb42 Mon Sep 17 00:00:00 2001
From: Pietro Abate <pietro.abate@nomadic-labs.com>
Date: Fri, 3 Mar 2023 15:27:32 +0100
Subject: [PATCH] lib_shell_services: port to alcotezt

---
 manifest/main.ml                 |  6 ++--
 opam/tezos-shell-services.opam   |  4 ++-
 src/lib_shell_services/test/dune | 49 ++++++++++++++++++++++++++------
 tezt/tests/dune                  |  1 +
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 3ef4875c4731..533801ee65ef 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -1487,15 +1487,15 @@ let octez_test_helpers_extra =
     ~modules:["assert_lib"]
 
 let _octez_shell_services_tests =
-  test
-    "test_block_services"
+  tezt
+    ["test_block_services"]
     ~path:"src/lib_shell_services/test"
     ~opam:"tezos-shell-services"
     ~deps:
       [
         octez_base |> open_ ~m:"TzPervasives";
         octez_shell_services |> open_;
-        alcotest;
+        alcotezt;
       ]
     ~modes:[Native; JS]
     ~js_compatible:true
diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam
index 89861404495d..f7bd8b2965d2 100644
--- a/opam/tezos-shell-services.opam
+++ b/opam/tezos-shell-services.opam
@@ -15,11 +15,13 @@ depends: [
   "tezos-p2p-services"
   "tezos-version"
   "tezos-context"
-  "alcotest" { with-test & >= "1.5.0" }
+  "tezt" { with-test & >= "3.0.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: descriptions of RPCs exported by `tezos-shell`"
diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune
index 6f1ce151d480..2ccc53398506 100644
--- a/src/lib_shell_services/test/dune
+++ b/src/lib_shell_services/test/dune
@@ -3,25 +3,56 @@
 
 (env (_ (env-vars (NODE_PRELOAD hacl-wasm,ocaml-bls12-381,secp256k1-wasm))))
 
-(executable
- (name test_block_services)
- (modes native js)
+(library
+ (name src_lib_shell_services_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-base
   tezos-shell-services
-  alcotest)
+  octez-alcotezt)
  (js_of_ocaml)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_base.TzPervasives
-  -open Tezos_shell_services))
+  -open Tezos_shell_services
+  -open Octez_alcotezt)
+ (modules test_block_services))
+
+(executable
+ (name main)
+ (modes native)
+ (libraries
+  src_lib_shell_services_test_tezt_lib
+  tezt)
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-shell-services)
- (action (run %{dep:./test_block_services.exe})))
+ (action (run %{dep:./main.exe})))
+
+(rule
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
+
+(executable
+ (name main_js)
+ (modes js)
+ (libraries
+  src_lib_shell_services_test_tezt_lib
+  tezt.js)
+ (js_of_ocaml)
+ (modules main_js))
 
 (rule
- (alias runtest_js)
+ (alias runtezt_js)
  (package tezos-shell-services)
- (action (run node %{dep:./test_block_services.bc.js})))
+ (action (run node %{dep:./main_js.bc.js})))
+
+(rule
+ (targets main_js.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt_js.Test.run ()"))))
diff --git a/tezt/tests/dune b/tezt/tests/dune
index df89f9af13c5..8b5861c6b66c 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -44,6 +44,7 @@
   src_lib_stdlib_test_tezt_lib
   src_lib_signer_backends_unix_test_tezt_lib
   src_lib_signer_backends_test_tezt_lib
+  src_lib_shell_services_test_tezt_lib
   src_lib_shell_test_tezt_lib
   src_lib_sapling_test_tezt_lib
   src_lib_requester_test_tezt_lib
-- 
GitLab