Resolve a conflict #13216 #12324 #13180

Author: michaelklishin

deps/rabbitmq_mqtt/test/auth_SUITE.erl

@@ -49,7 +49,7 @@ sub_groups() ->
        ssl_user_vhost_parameter_mapping_vhost_does_not_exist,
        ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping
       ]},
-     {anonymous_no_ssl_user, [shuffle],
+      {anonymous_no_ssl_user, [shuffle],
       [anonymous_auth_success,
        user_credentials_auth,
        port_vhost_mapping_success,
@@ -69,21 +69,10 @@ sub_groups() ->
        ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping
       ]},
      {ssl_user_with_invalid_client_id_in_cert_san_dns, [],
-<<<<<<< HEAD
-<<<<<<< HEAD
        [invalid_client_id_from_cert_san_dns
        ]},
      {ssl_user_with_client_id_in_cert_san_dns, [],
-       [client_id_from_cert_san_dns        
-=======
        [client_id_from_cert_san_dns
-=======
-       [invalid_client_id_from_cert_san_dns
->>>>>>> aeda3cada (Fix test case name)
-       ]}, 
-     {ssl_user_with_client_id_in_cert_san_dns, [],
-       [client_id_from_cert_san_dns
->>>>>>> bf7de92aa (Apply fix from PR #13180)
        ]},
      {ssl_user_with_client_id_in_cert_san_dns_1, [],
        [client_id_from_cert_san_dns_1
@@ -220,13 +209,8 @@ mqtt_config(no_ssl_user) ->
 mqtt_config(client_id_propagation) ->
     {rabbitmq_mqtt, [{ssl_cert_login,  true},
                      {allow_anonymous, true}]};
-<<<<<<< HEAD
-mqtt_config(T) when T == ssl_user_with_client_id_in_cert_san_dns;
-                    T == ssl_user_with_invalid_client_id_in_cert_san_dns ->
-=======
 mqtt_config(T) when T == ssl_user_with_invalid_client_id_in_cert_san_dns;
                          ssl_user_with_client_id_in_cert_san_dns ->
->>>>>>> bf7de92aa (Apply fix from PR #13180)
     {rabbitmq_mqtt, [{ssl_cert_login,  true},
                      {allow_anonymous, false},
                      {ssl_cert_client_id_from, subject_alternative_name},
@@ -607,13 +591,8 @@ client_id_from_cert_dn(Config) ->
 invalid_client_id_from_cert_san_dns(Config) ->
     MqttClientId = <<"other_client_id">>,
     {ok, C} = connect_ssl(MqttClientId, Config),
-<<<<<<< HEAD
-    unlink(C),
-    {error, {client_identifier_not_valid, _}} = emqtt:connect(C).        
-=======
     {error, {client_identifier_not_valid, _}} = emqtt:connect(C),
     unlink(C).
->>>>>>> bf7de92aa (Apply fix from PR #13180)
 
 ssl_user_vhost_parameter_mapping_success(Config) ->
     expect_successful_connection(fun connect_ssl/1, Config).