From cba38659326891654992f89a741a989b78a917b4 Mon Sep 17 00:00:00 2001
From: lykimq <lykimq@gmail.com>
Date: Mon, 27 Mar 2023 10:43:01 +0200
Subject: [PATCH] Alcotezt: port [src/lib_dac_node/test]

---
 manifest/main.ml                              |  6 ++--
 opam/tezos-dac-node-lib-test.opam             |  4 ++-
 src/lib_dac_node/test/dune                    | 35 ++++++++++++++-----
 src/lib_dac_node/test/test_data_streamer.ml   |  3 +-
 .../test/{main.ml => test_main.ml}            |  7 ++++
 tezt/tests/dune                               |  1 +
 6 files changed, 42 insertions(+), 14 deletions(-)
 rename src/lib_dac_node/test/{main.ml => test_main.ml} (93%)

diff --git a/manifest/main.ml b/manifest/main.ml
index e76e4691bf33..58c5106f06aa 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -3404,8 +3404,8 @@ let octez_dac_node_lib =
       ]
 
 let _octez_dac_node_lib_tests =
-  test
-    "main"
+  tezt
+    ["test_main"; "test_data_streamer"]
     ~path:"src/lib_dac_node/test"
     ~opam:"tezos-dac-node-lib-test"
     ~synopsis:"Test for dac node lib"
@@ -3418,7 +3418,7 @@ let _octez_dac_node_lib_tests =
         octez_test_helpers |> open_;
         octez_base_test_helpers |> open_;
         octez_dac_node_lib |> open_;
-        alcotest_lwt;
+        alcotezt;
       ]
 
 let octez_node_config =
diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam
index f21b671a59dd..81f47af2cc0c 100644
--- a/opam/tezos-dac-node-lib-test.opam
+++ b/opam/tezos-dac-node-lib-test.opam
@@ -10,17 +10,19 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "ocaml" { >= "4.14" }
+  "tezt" { with-test & >= "3.0.0" }
   "tezos-stdlib" {with-test}
   "tezos-stdlib-unix" {with-test}
   "tezos-base" {with-test}
   "tezos-test-helpers" {with-test}
   "tezos-base-test-helpers" {with-test}
   "tezos-dac-node-lib" {with-test}
-  "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: "Test for dac node lib"
diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune
index 2c03c2b08ec9..a6aef6adf8b5 100644
--- a/src/lib_dac_node/test/dune
+++ b/src/lib_dac_node/test/dune
@@ -1,30 +1,49 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executable
- (name main)
+(library
+ (name src_lib_dac_node_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-stdlib
   tezos-stdlib-unix
   tezos-base
   tezos-test-helpers
   tezos-base-test-helpers
   tezos_dac_node_lib
-  alcotest-lwt)
- (link_flags
-  (:standard)
-  (:include %{workspace_root}/macos-link-flags.sexp))
+  octez-alcotezt)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_stdlib
   -open Tezos_stdlib_unix
   -open Tezos_base
   -open Tezos_base.TzPervasives
   -open Tezos_test_helpers
   -open Tezos_base_test_helpers
-  -open Tezos_dac_node_lib))
+  -open Tezos_dac_node_lib
+  -open Octez_alcotezt)
+ (modules test_main test_data_streamer))
+
+(executable
+ (name main)
+ (instrumentation (backend bisect_ppx --bisect-sigterm))
+ (libraries
+  src_lib_dac_node_test_tezt_lib
+  tezt)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/macos-link-flags.sexp))
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-dac-node-lib-test)
  (action (run %{dep:./main.exe})))
+
+(rule
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
diff --git a/src/lib_dac_node/test/test_data_streamer.ml b/src/lib_dac_node/test/test_data_streamer.ml
index 592079611bf4..1dd820cc39e7 100644
--- a/src/lib_dac_node/test/test_data_streamer.ml
+++ b/src/lib_dac_node/test/test_data_streamer.ml
@@ -26,8 +26,7 @@
 (** Testing
     -------
     Component:  Lib_dac_node Data_streamer
-    Invocation: dune exec src/lib_dac_node/test/main.exe \
-                  -- test "^\[Unit\] Data_streamer.ml$"   
+    Invocation: dune exec src/lib_dac_node/test/main.exe   
     Subject:    Tests for the data streamer component.
 *)
 
diff --git a/src/lib_dac_node/test/main.ml b/src/lib_dac_node/test/test_main.ml
similarity index 93%
rename from src/lib_dac_node/test/main.ml
rename to src/lib_dac_node/test/test_main.ml
index 51faa35f86c2..47990da85670 100644
--- a/src/lib_dac_node/test/main.ml
+++ b/src/lib_dac_node/test/test_main.ml
@@ -23,6 +23,13 @@
 (*                                                                           *)
 (*****************************************************************************)
 
+(** Testing
+    -------
+    Component:  Lib_dac_node Data_streamer
+    Invocation: dune exec src/lib_dac_node/test/main.exe   
+    Subject:    Tests for the data streamer component.
+*)
+
 module Unit_test : sig
   (**
    * Example: [spec "Data_streamer.ml" Test_data_streamer.tests]
diff --git a/tezt/tests/dune b/tezt/tests/dune
index 422651ae64d9..7bdf945c6c7e 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -80,6 +80,7 @@
   src_lib_lazy_containers_test_tezt_lib
   src_lib_layer2_store_test__tezt_lib
   src_lib_error_monad_test_tezt_lib
+  src_lib_dac_node_test_tezt_lib
   src_lib_crypto_dal_test_tezt_lib
   src_lib_crypto_test_unix_tezt_lib
   src_lib_crypto_test_tezt_lib
-- 
GitLab