From 0add2e86e220a8d87234f7127ba09630ae3234e5 Mon Sep 17 00:00:00 2001
From: Pietro Abate <pietro.abate@nomadic-labs.com>
Date: Wed, 8 Feb 2023 15:41:17 +0100
Subject: [PATCH] lib_mockup: port tests to alcotezt

---
 manifest/main.ml         |  4 ++--
 opam/tezos-mockup.opam   |  4 +++-
 src/lib_mockup/test/dune | 35 ++++++++++++++++++++---------------
 tezt/tests/dune          |  1 +
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 37bf85671408..59449031b317 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -2963,7 +2963,7 @@ let octez_mockup_commands =
     ~modules:["mockup_wallet"; "mockup_commands"]
 
 let _octez_mockup_tests =
-  tests
+  tezt
     ["test_mockup_args"; "test_fuzzing_mockup_args"; "test_persistence"]
     ~path:"src/lib_mockup/test"
     ~opam:"tezos-mockup"
@@ -2977,7 +2977,7 @@ let _octez_mockup_tests =
         octez_mockup_registration;
         octez_client_base;
         qcheck_alcotest;
-        alcotest_lwt;
+        alcotezt;
       ]
 
 let octez_proxy =
diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam
index 1a9f49eeee0a..118cac5d9944 100644
--- a/opam/tezos-mockup.opam
+++ b/opam/tezos-mockup.opam
@@ -22,14 +22,16 @@ depends: [
   "tezos-rpc-http"
   "tezos-rpc-http-client"
   "tezos-mockup-registration"
+  "tezt" { with-test & >= "3.0.0" }
   "tezos-base-test-helpers" {with-test}
   "tezos-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 (mockup mode)"
diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune
index ecfb0d6b54c2..94cc36ed3b1d 100644
--- a/src/lib_mockup/test/dune
+++ b/src/lib_mockup/test/dune
@@ -1,9 +1,11 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executables
- (names test_mockup_args test_fuzzing_mockup_args test_persistence)
+(library
+ (name src_lib_mockup_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-base
   tezos-base-test-helpers
   tezos-test-helpers
@@ -12,24 +14,27 @@
   tezos-mockup-registration
   tezos-client-base
   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_base_test_helpers
-  -open Tezos_test_helpers))
+  -open Tezos_test_helpers
+  -open Octez_alcotezt)
+ (modules test_mockup_args test_fuzzing_mockup_args test_persistence))
 
-(rule
- (alias runtest)
- (package tezos-mockup)
- (action (run %{dep:./test_mockup_args.exe})))
+(executable
+ (name main)
+ (libraries
+  src_lib_mockup_test_tezt_lib
+  tezt)
+ (modules main))
 
-(rule
- (alias runtest)
- (package tezos-mockup)
- (action (run %{dep:./test_fuzzing_mockup_args.exe})))
+(rule (alias runtezt) (package tezos-mockup) (action (run %{dep:./main.exe})))
 
 (rule
- (alias runtest)
- (package tezos-mockup)
- (action (run %{dep:./test_persistence.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 7eaaffb5d250..45bf55cae7cc 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -20,6 +20,7 @@
   src_lib_stdlib_test_unix_tezt_lib
   src_lib_stdlib_test_tezt_lib
   src_lib_p2p_tezt_tezt_lib
+  src_lib_mockup_test_tezt_lib
   src_lib_lwt_result_stdlib_test_tezt_lib
   src_lib_lazy_containers_test_tezt_lib
   src_lib_error_monad_test_tezt_lib
-- 
GitLab