Skip to content

Commit 084b904

Browse files
authored
Merge pull request #4212 from rabbitmq/mergify/bp/v3.8.x/pr-4211
Use the assert_suites function from rules_erlang (backport #4207) (backport #4210) (backport #4211)
2 parents 6c6dfcf + 7644938 commit 084b904

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

rabbitmq.bzl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ load(
55
"erlang_app",
66
"test_erlang_app",
77
)
8-
load("@rules_erlang//:ct_sharded.bzl", "ct_suite", "ct_suite_variant")
8+
load(
9+
"@rules_erlang//:ct_sharded.bzl",
10+
"ct_suite",
11+
"ct_suite_variant",
12+
_assert_suites = "assert_suites",
13+
)
914
load("//:rabbitmq_home.bzl", "rabbitmq_home")
1015
load("//:rabbitmq_run.bzl", "rabbitmq_run")
1116

@@ -260,7 +265,4 @@ def rabbitmq_integration_suite(
260265
return name
261266

262267
def assert_suites(suite_names, suite_files):
263-
for f in suite_files:
264-
sn = f.rpartition("/")[-1].replace(".erl", "")
265-
if not sn in suite_names:
266-
fail("A bazel rule has not been defined for {} (expected {} in {}".format(f, sn, suite_names))
268+
_assert_suites(suite_names, suite_files)

0 commit comments

Comments
 (0)