Tests: system_SUITE return configuration from run steps

(cherry picked from commit 4a925f9)

# Conflicts:
#	deps/oauth2_client/test/system_SUITE.erl

Author: dcorbacho

deps/oauth2_client/test/system_SUITE.erl

@@ -94,9 +94,12 @@ init_per_group(https, Config) ->
     WrongCaCertFile = filename:join([CertsDir, "server", "server.pem"]),
     [{group, https},
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         {certsdir, CertsDir},
 >>>>>>> 9b1e762081 (Store the certsDir of the group which)
+=======
+>>>>>>> 4a925f9a8c (Tests: system_SUITE return configuration from run steps)
         {oauth_provider_id, <<"uaa">>},
         {oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)},
         {oauth_provider_with_issuer, keep_only_issuer_and_ssl_options(
@@ -113,9 +116,8 @@ init_per_group(https_down, Config) ->
     CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
 
     [{issuer, build_issuer("https")},
-        {certsdir, CertsDir},
         {oauth_provider_id, <<"uaa">>},
-        {oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)} | Config];
+        {oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)} | Config0];
 
 init_per_group(openid_configuration_with_path, Config) ->
     [{use_openid_configuration_with_path, true} | Config];
@@ -126,20 +128,18 @@ init_per_group(with_all_oauth_provider_settings, Config) ->
     CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
 
     [{with_all_oauth_provider_settings, true},
-     {certsdir, CertsDir},
      {oauth_provider_id, <<"uaa">>},
-     {oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)} | Config];
+     {oauth_provider, build_https_oauth_provider(<<"uaa">>, CaCertFile)} | Config0];
 
 init_per_group(without_all_oauth_providers_settings, Config) ->
     Config0 = rabbit_ct_helpers:run_setup_steps(Config),
     CertsDir = ?config(rmq_certsdir, Config0),
     CaCertFile = filename:join([CertsDir, "testca", "cacert.pem"]),
 
     [{with_all_oauth_provider_settings, false},
-        {certsdir, CertsDir},
         {oauth_provider_id, <<"uaa">>},
         {oauth_provider, keep_only_issuer_and_ssl_options(
-            build_https_oauth_provider(<<"uaa">>, CaCertFile))} | Config];
+            build_https_oauth_provider(<<"uaa">>, CaCertFile))} | Config0];
 
 init_per_group(with_default_oauth_provider, Config) ->
     OAuthProvider = ?config(oauth_provider, Config),
@@ -251,12 +251,16 @@ init_per_testcase(TestCase, Config) ->
 
     case ?config(group, Config) of
         https ->
+<<<<<<< HEAD
 <<<<<<< HEAD
             ct:log("Start https with expectations ~p", [ListOfExpectations]),
             start_https_oauth_server(?AUTH_PORT, ?config(rmq_certsdir, Config),
 =======
             start_https_oauth_server(?AUTH_PORT, ?config(certsdir, Config),
 >>>>>>> 9b1e762081 (Store the certsDir of the group which)
+=======
+            start_https_oauth_server(?AUTH_PORT, ?config(rmq_certsdir, Config),
+>>>>>>> 4a925f9a8c (Tests: system_SUITE return configuration from run steps)
                 ListOfExpectations);
         _ ->
             do_nothing