Adjustments for the latest bazel-erlang

Author: HoloRin

BAZEL.md

@@ -35,7 +35,7 @@ Create a `user.bazelrc` by making a copy of `user-template.bazelrc` and updating
 
 ### Running tests
 
-Many rabbit tests spawn single or clustered rabbit nodes, and therefore it's best to run test suites sequentially on a single machine. Hence the `build --local_test_jobs=1` flag used in `.bazelrc`. Additionally, it may be reasonable to disable test sharding and stream test output when running tests locally with `--test_sharding_strategy=disabled` & `--test_output=streamed` additional arguments. Naturally that restriction does not hold if utilizing remote execution (as is the case for RabbitMQ's CI pipelines).
+Many rabbit tests spawn single or clustered rabbit nodes, and therefore it's best to run test suites sequentially on a single machine. Hence the `build --local_test_jobs=1` flag used in `.bazelrc`. Additionally, it may be reasonable to disable test sharding and stream test output when running tests locally with `--test_output=streamed` as an additional argument (to just disable sharding, but not stream output, use `--test_sharding_strategy=disabled`). Naturally that restriction does not hold if utilizing remote execution (as is the case for RabbitMQ's CI pipelines).
 
 Erlang Common Test logs will not be placed in the logs directory when run with bazel. They can be found under `bazel-testlogs`. For instance, those of the rabbit application's backing_queue suite will be under `bazel-testlogs/deps/rabbit/backing_queue_SUITE/test.outputs/`.
 

deps/rabbitmq_cli/rabbitmqctl.bzl

@@ -131,7 +131,7 @@ def _impl(ctx):
     deps = flat_deps(ctx.attr.deps)
 
     runfiles = ctx.runfiles([ebin])
-    for dep in ctx.attr.deps:
+    for dep in deps:
         runfiles = runfiles.merge(dep[DefaultInfo].default_runfiles)
 
     return [

deps/rabbitmq_ct_helpers/BUILD.bazel

@@ -7,4 +7,8 @@ erlang_lib(
         "@proper//:bazel_erlang_lib",
         "//deps/rabbit_common:bazel_erlang_lib",
     ],
+    extra_priv = [
+        "tools/tls-certs/Makefile",
+        "tools/tls-certs/openssl.cnf.in",
+    ],
 )

deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl

@@ -482,7 +482,9 @@ load_rabbitmqctl_app(Config) ->
             Config;
         {error, {already_loaded, rabbitmqctl}} ->
             Config;
-        {error, _} ->
+        {error, Reason} ->
+            ct:pal(?LOW_IMPORTANCE,
+              "Failed to load rabbitmqctl application: ~p", [Reason]),
             {skip, "Application rabbitmqctl could not be loaded, " ++
                 "please place compiled rabbitmq_cli on the code path"}
     end.

deps/rabbitmq_ct_helpers/tools/tls-certs/BUILD.bazel

@@ -87,6 +87,7 @@ erlc(
         "src/**/*.hrl",
     ]),
     erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
+    dest = "test",
     deps = [
         ":test_bazel_erlang_lib",
     ],

deps/rabbitmq_stomp/BUILD.bazel

@@ -43,9 +43,6 @@ test_erlang_lib(
     app_name = APP_NAME,
     app_version = APP_VERSION,
     extra_apps = EXTRA_APPS,
-    extra_priv = [
-        "test/priv/www/index.html",
-    ],
     deps = DEPS,
 )
 
@@ -84,6 +81,9 @@ suites = [
     rabbitmq_integration_suite(
         PACKAGE,
         name = "rabbit_web_dispatch_SUITE",
+        data = [
+            "test/priv/www/index.html",
+        ],
     ),
     rabbitmq_suite(
         name = "rabbit_web_dispatch_unit_SUITE",

deps/rabbitmq_web_dispatch/BUILD.bazel

@@ -71,12 +71,9 @@ query_static_resource_test1(Host, Port) ->
     rabbit_web_dispatch:register_static_context(test, [{port, Port}],
                                                 "rabbit_web_dispatch_test",
                                                 ?MODULE, "test/priv/www", "Test"),
-    inets:start(),
     {ok, {_Status, _Headers, Body}} =
         httpc:request(format("http://~s:~w/rabbit_web_dispatch_test/index.html", [Host, Port])),
-    ?assert(string:str(Body, "RabbitMQ HTTP Server Test Page") /= 0),
-
-    passed.
+    ?assertMatch(I when I > 0, string:str(Body, "RabbitMQ HTTP Server Test Page")).
 
 add_idempotence_test(Config) ->
     Port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_http_extra),

deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_SUITE.erl

@@ -67,6 +67,7 @@ erlc(
     name = "test_utils",
     srcs = glob(["test/src/*.erl"]),
     hdrs = glob(["test/src/*.hrl"]),
+    dest = "test",
     erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
 )
 

deps/rabbitmq_web_mqtt/BUILD.bazel

@@ -128,10 +128,7 @@ def rabbitmq_integration_suite(
         erlc_opts = RABBITMQ_TEST_ERLC_OPTS + erlc_opts,
         additional_hdrs = additional_hdrs,
         additional_srcs = additional_srcs,
-        data = [
-            "//deps/rabbitmq_ct_helpers/tools/tls-certs:Makefile",
-            "//deps/rabbitmq_ct_helpers/tools/tls-certs:openssl.cnf.in",
-        ] + data,
+        data = data,
         test_env = dict({
             "SKIP_MAKE_TEST_DIST": "true",
             "RABBITMQ_CT_SKIP_AS_ERROR": "true",
@@ -160,10 +157,7 @@ def rabbitmq_integration_suite(
         name = name + "-mixed",
         suite_name = name,
         tags = tags + ["mixed-version-cluster"],
-        data = [
-            "//deps/rabbitmq_ct_helpers/tools/tls-certs:Makefile",
-            "//deps/rabbitmq_ct_helpers/tools/tls-certs:openssl.cnf.in",
-        ] + data,
+        data = data,
         test_env = dict({
             "SKIP_MAKE_TEST_DIST": "true",
             "RABBITMQ_FEATURE_FLAGS": "",