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

---
 manifest/main.ml            |  6 +++---
 opam/tezos-requester.opam   |  4 +++-
 src/lib_requester/test/dune | 31 ++++++++++++++++++++++---------
 tezt/tests/dune             |  1 +
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 259fd4a5d2b5..2de20121f87f 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -2622,8 +2622,8 @@ let octez_requester =
       ]
 
 let _octez_requester_tests =
-  tests
-    ["test_requester"; "test_fuzzing_requester"]
+  tezt
+    ["test_requester"; "test_fuzzing_requester"; "shared"]
     ~path:"src/lib_requester/test"
     ~opam:"tezos-requester"
     ~deps:
@@ -2635,7 +2635,7 @@ let _octez_requester_tests =
         octez_stdlib |> open_;
         octez_stdlib_unix;
         octez_requester |> open_;
-        alcotest_lwt;
+        alcotezt;
         qcheck_alcotest;
       ]
 
diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam
index 99ffda04a0ba..6709a89bd661 100644
--- a/opam/tezos-requester.opam
+++ b/opam/tezos-requester.opam
@@ -13,15 +13,17 @@ depends: [
   "tezos-base"
   "tezos-stdlib-unix"
   "lwt-watcher" { = "0.2" }
+  "tezt" { with-test & >= "3.0.0" }
   "tezos-test-helpers" {with-test}
   "tezos-base-test-helpers" {with-test}
   "tezos-stdlib" {with-test}
-  "alcotest-lwt" { with-test & >= "1.5.0" }
+  "octez-alcotezt" {with-test}
   "qcheck-alcotest" { with-test & >= "0.20" }
 ]
 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: generic resource fetching service"
diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune
index 28e883f46387..edba7b3f9e93 100644
--- a/src/lib_requester/test/dune
+++ b/src/lib_requester/test/dune
@@ -1,9 +1,11 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executables
- (names test_requester test_fuzzing_requester)
+(library
+ (name src_lib_requester_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-base
   tezos-base.unix
   tezos-test-helpers
@@ -11,22 +13,33 @@
   tezos-stdlib
   tezos-stdlib-unix
   tezos-requester
-  alcotest-lwt
+  octez-alcotezt
   qcheck-alcotest)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_base.TzPervasives
   -open Tezos_test_helpers
   -open Tezos_base_test_helpers
   -open Tezos_stdlib
-  -open Tezos_requester))
+  -open Tezos_requester
+  -open Octez_alcotezt)
+ (modules test_requester test_fuzzing_requester shared))
+
+(executable
+ (name main)
+ (libraries
+  src_lib_requester_test_tezt_lib
+  tezt)
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-requester)
- (action (run %{dep:./test_requester.exe})))
+ (action (run %{dep:./main.exe})))
 
 (rule
- (alias runtest)
- (package tezos-requester)
- (action (run %{dep:./test_fuzzing_requester.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 9a75882cbfe3..e20b87f2a39f 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -43,6 +43,7 @@
   src_lib_signer_backends_test_tezt_lib
   src_lib_shell_test_tezt_lib
   src_lib_sapling_test_tezt_lib
+  src_lib_requester_test_tezt_lib
   src_lib_p2p_tezt_tezt_lib
   src_lib_mockup_test_tezt_lib
   src_lib_lwt_result_stdlib_test_tezt_lib
-- 
GitLab