Skip to content

Commit 015b44d

Browse files
authored
Merge pull request #4532 from esl/fix-failing-s2s-tests
Skip failing S2S test for GH Actions
2 parents 25eea27 + 91c51d2 commit 015b44d

File tree

1 file changed

+28
-5
lines changed

1 file changed

+28
-5
lines changed

big_tests/tests/s2s_SUITE.erl

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,29 @@ init_per_testcase(dns_srv_discovery = CaseName, Config) ->
151151
Config1 = escalus_users:update_userspec(Config, alice2, server, <<"fed2">>),
152152
escalus:init_per_testcase(CaseName, Config1);
153153
init_per_testcase(dns_ip_discovery = CaseName, Config) ->
154-
meck_dns_srv_lookup("fed2", ip),
155-
Config1 = escalus_users:update_userspec(Config, alice2, server, <<"fed2">>),
156-
escalus:init_per_testcase(CaseName, Config1);
154+
case is_github_actions() of
155+
true ->
156+
{skip, "Test skipped for GH Actions"};
157+
false ->
158+
meck_dns_srv_lookup("fed2", ip),
159+
Config1 = escalus_users:update_userspec(Config, alice2, server, <<"fed2">>),
160+
escalus:init_per_testcase(CaseName, Config1)
161+
end;
157162
init_per_testcase(dns_discovery_fail = CaseName, Config) ->
158-
meck_dns_srv_lookup("fed3", none),
159-
escalus:init_per_testcase(CaseName, Config);
163+
case is_github_actions() of
164+
true ->
165+
{skip, "Test skipped for GH Actions"};
166+
false ->
167+
meck_dns_srv_lookup("fed3", none),
168+
escalus:init_per_testcase(CaseName, Config)
169+
end;
170+
init_per_testcase(unknown_domain = CaseName, Config) ->
171+
case is_github_actions() of
172+
true ->
173+
{skip, "Test skipped for GH Actions"};
174+
false ->
175+
escalus:init_per_testcase(CaseName, Config)
176+
end;
160177
init_per_testcase(CaseName, Config) ->
161178
escalus:init_per_testcase(CaseName, Config).
162179

@@ -192,6 +209,12 @@ inet_res_lookup_fun(Domain, _FedPort, none) ->
192209
meck:passthrough([Name, Class, Type, Opts, Timeout])
193210
end.
194211

212+
is_github_actions() ->
213+
case os:getenv("GITHUB_ACTIONS") of
214+
"true" -> true;
215+
_ -> false
216+
end.
217+
195218
end_per_testcase(CaseName, Config) when CaseName =:= dns_srv_discovery;
196219
CaseName =:= dns_ip_discovery;
197220
CaseName =:= dns_discovery_fail ->

0 commit comments

Comments
 (0)