From b6c86caa5cc819f2b892ea1329af26ac60875d8a Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Wed, 21 Jun 2023 10:06:14 +0200 Subject: [PATCH 1/2] Tezt: move Tag to tezos-test-helpers --- manifest/main.ml | 12 +----------- src/lib_test/dune | 11 +---------- {tezt/lib_tezos => src/lib_test}/tag.ml | 0 {tezt/lib_tezos => src/lib_test}/tag.mli | 0 tezt/long_tests/dune | 2 ++ tezt/tests/dune | 2 ++ 6 files changed, 6 insertions(+), 21 deletions(-) rename {tezt/lib_tezos => src/lib_test}/tag.ml (100%) rename {tezt/lib_tezos => src/lib_test}/tag.mli (100%) diff --git a/manifest/main.ml b/manifest/main.ml index 64e580e7cb33..dc30ea6f15b2 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -475,17 +475,6 @@ let octez_test_helpers = complains that the alias is empty. *) alias_rule "runtest_js" ~action:(S "progn"); ] - ~modules: - [ - "assert"; - "lwt_assert"; - "qcheck2_helpers"; - "qcheck_extra"; - "qcheck_helpers"; - "random_pure"; - "roundtrip"; - "testable"; - ] let octez_expect_helper = public_lib @@ -7584,6 +7573,7 @@ let () = let make_tezt_exe test_libs = let deps = [ + octez_test_helpers |> open_; tezt_lib |> open_ |> open_ ~m:"Base"; str; bls12_381; diff --git a/src/lib_test/dune b/src/lib_test/dune index cea3a2ce08ed..ba18f2b8fa47 100644 --- a/src/lib_test/dune +++ b/src/lib_test/dune @@ -13,15 +13,6 @@ pure-splitmix data-encoding) (js_of_ocaml) - (library_flags (:standard -linkall)) - (modules - assert - lwt_assert - qcheck2_helpers - qcheck_extra - qcheck_helpers - random_pure - roundtrip - testable)) + (library_flags (:standard -linkall))) (rule (alias runtest_js) (action progn)) diff --git a/tezt/lib_tezos/tag.ml b/src/lib_test/tag.ml similarity index 100% rename from tezt/lib_tezos/tag.ml rename to src/lib_test/tag.ml diff --git a/tezt/lib_tezos/tag.mli b/src/lib_test/tag.mli similarity index 100% rename from tezt/lib_tezos/tag.mli rename to src/lib_test/tag.mli diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 167f82f5acea..d5ae8ea591ad 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -12,6 +12,7 @@ tezos-time-measurement data-encoding tezos-event-logging + tezos-test-helpers ) (flags (:standard -open Tezt @@ -21,5 +22,6 @@ -open Tezt_performance_regression -open Tezos_lwt_result_stdlib -open Tezos_event_logging + -open Tezos_test_helpers (:include %{workspace_root}/macos-link-flags.sexp) ))) diff --git a/tezt/tests/dune b/tezt/tests/dune index 573a863f575c..e11a62fff58c 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -5,6 +5,7 @@ (name main) (instrumentation (backend bisect_ppx --bisect-sigterm)) (libraries + tezos-test-helpers tezt str bls12-381 @@ -131,6 +132,7 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) + -open Tezos_test_helpers -open Tezt -open Tezt.Base -open Tezt_tezos -- GitLab From 65aef0bf07ac14cccb362cf15542627349c620de Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 26 Jun 2023 15:55:36 +0200 Subject: [PATCH 2/2] Tezt: use Tag.flaky in P2P tests --- src/lib_p2p/tezt/test_p2p_socket.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib_p2p/tezt/test_p2p_socket.ml b/src/lib_p2p/tezt/test_p2p_socket.ml index 5cc9d12de625..fb311fc6410b 100644 --- a/src/lib_p2p/tezt/test_p2p_socket.ml +++ b/src/lib_p2p/tezt/test_p2p_socket.ml @@ -69,7 +69,7 @@ let nack_test () = (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5903 The tests using forked processes are flaky, EBADF error is raised. *) - "flaky"; + Tag.flaky; "p2p"; "socket"; "nack"; @@ -123,7 +123,7 @@ module Self_identification = struct (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5903 The tests using forked processes are flaky, EBADF error is raised. *) - "flaky"; + Tag.flaky; "p2p"; "socket"; "self_identification"; @@ -180,7 +180,7 @@ module Self_identification = struct (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5903 The tests using forked processes are flaky, EBADF error is raised. *) - "flaky"; + Tag.flaky; "p2p"; "socket"; "self_identification"; -- GitLab