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

---
 manifest/main.ml                              |  6 ++--
 opam/tezos-layer2-store.opam                  |  4 ++-
 src/lib_layer2_store/test/dune                | 31 +++++++++++++++----
 .../test/test_indexed_store.ml                |  5 ++-
 tezt/tests/dune                               |  1 +
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index d58798dc9089..74101517b191 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3323,8 +3323,8 @@ let octez_layer2_store =
     ~linkall:true
 
 let _octez_layer2_indexed_store_test =
-  test
-    "test_indexed_store"
+  tezt
+    ["test_indexed_store"]
     ~path:"src/lib_layer2_store/test/"
     ~opam:"tezos-layer2-store"
     ~deps:
@@ -3332,7 +3332,7 @@ let _octez_layer2_indexed_store_test =
         octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib";
         octez_layer2_store |> open_;
         qcheck_alcotest;
-        alcotest_lwt;
+        alcotezt;
       ]
 
 let octez_dal_node_services =
diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam
index 8fe7b62396fb..6effd2462f0d 100644
--- a/opam/tezos-layer2-store.opam
+++ b/opam/tezos-layer2-store.opam
@@ -17,13 +17,15 @@ depends: [
   "aches-lwt" { >= "1.0.0" }
   "tezos-stdlib-unix"
   "tezos-context"
+  "tezt" { with-test & >= "3.0.0" }
   "tezos-error-monad" {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: layer2 storage utils"
diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune
index 06dd4ff8daab..0703c5910ca7 100644
--- a/src/lib_layer2_store/test/dune
+++ b/src/lib_layer2_store/test/dune
@@ -1,20 +1,39 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executable
- (name test_indexed_store)
+(library
+ (name src_lib_layer2_store_test__tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-error-monad
   tezos_layer2_store
   qcheck-alcotest
-  alcotest-lwt)
+  octez-alcotezt)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_error_monad
   -open Tezos_error_monad.TzLwtreslib
-  -open Tezos_layer2_store))
+  -open Tezos_layer2_store
+  -open Octez_alcotezt)
+ (modules test_indexed_store))
+
+(executable
+ (name main)
+ (instrumentation (backend bisect_ppx --bisect-sigterm))
+ (libraries
+  src_lib_layer2_store_test__tezt_lib
+  tezt)
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-layer2-store)
- (action (run %{dep:./test_indexed_store.exe})))
+ (action (run %{dep:./main.exe})))
+
+(rule
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
diff --git a/src/lib_layer2_store/test/test_indexed_store.ml b/src/lib_layer2_store/test/test_indexed_store.ml
index 2846417609f9..4c83397ad79f 100644
--- a/src/lib_layer2_store/test/test_indexed_store.ml
+++ b/src/lib_layer2_store/test/test_indexed_store.ml
@@ -599,4 +599,7 @@ let () =
     (test_gen `Parallel)
     R.check_run
 
-let () = QCheck_base_runner.run_tests_main (List.rev !tests)
+let () =
+  Alcotest.run
+    "tezos-layer2-store"
+    [("indexed-store", List.map QCheck_alcotest.to_alcotest !tests)]
diff --git a/tezt/tests/dune b/tezt/tests/dune
index 0c9fb29f9f7a..4c1f8168da62 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -79,6 +79,7 @@
   src_lib_mockup_test_tezt_lib
   src_lib_lwt_result_stdlib_test_tezt_lib
   src_lib_lazy_containers_test_tezt_lib
+  src_lib_layer2_store_test__tezt_lib
   src_lib_error_monad_test_tezt_lib
   src_lib_crypto_dal_test_tezt_lib
   src_lib_crypto_test_unix_tezt_lib
-- 
GitLab