Skip to content

Commit ec2ad37

Browse files
MarcialRosalesdcorbacho
authored andcommitted
Store the certsDir of the group which
initializes rabbitmq configuration
1 parent c1e60c1 commit ec2ad37

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

deps/oauth2_client/test/system_SUITE.erl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ init_per_group(https, Config) ->
9393
CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
9494
WrongCaCertFile = filename:join([CertsDir, "server", "server.pem"]),
9595
[{group, https},
96+
{certsdir, CertsDir},
9697
{oauth_provider_id, <<"uaa">>},
9798
{oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)},
9899
{oauth_provider_with_issuer, keep_only_issuer_and_ssl_options(
@@ -109,6 +110,7 @@ init_per_group(https_down, Config) ->
109110
CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
110111

111112
[{issuer, build_issuer("https")},
113+
{certsdir, CertsDir},
112114
{oauth_provider_id, <<"uaa">>},
113115
{oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)} | Config];
114116

@@ -121,6 +123,7 @@ init_per_group(with_all_oauth_provider_settings, Config) ->
121123
CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
122124

123125
[{with_all_oauth_provider_settings, true},
126+
{certsdir, CertsDir},
124127
{oauth_provider_id, <<"uaa">>},
125128
{oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)} | Config];
126129

@@ -130,6 +133,7 @@ init_per_group(without_all_oauth_providers_settings, Config) ->
130133
CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
131134

132135
[{with_all_oauth_provider_settings, false},
136+
{certsdir, CertsDir},
133137
{oauth_provider_id, <<"uaa">>},
134138
{oauth_provider, keep_only_issuer_and_ssl_options(
135139
build_https_oauth_provider(<<"uaa">>, CaCertFile))} | Config];
@@ -244,8 +248,12 @@ init_per_testcase(TestCase, Config) ->
244248

245249
case ?config(group, Config) of
246250
https ->
251+
<<<<<<< HEAD
247252
ct:log("Start https with expectations ~p", [ListOfExpectations]),
248253
start_https_oauth_server(?AUTH_PORT, ?config(rmq_certsdir, Config),
254+
=======
255+
start_https_oauth_server(?AUTH_PORT, ?config(certsdir, Config),
256+
>>>>>>> 9b1e762081 (Store the certsDir of the group which)
249257
ListOfExpectations);
250258
_ ->
251259
do_nothing

0 commit comments

Comments
 (0)