Fix regex for connection name because UniqueId is part of it now (channel number)

Author: lukebakken

deps/rabbitmq_amqp1_0/test/proxy_protocol_SUITE.erl

@@ -65,7 +65,7 @@ proxy_protocol_v1(Config) ->
     {ok, _Packet} = gen_tcp:recv(Socket, 0, ?TIMEOUT),
     ConnectionName = rabbit_ct_broker_helpers:rpc(Config, 0,
         ?MODULE, connection_name, []),
-    match = re:run(ConnectionName, <<"^192.168.1.1:80 -> 192.168.1.2:81$">>, [{capture, none}]),
+    match = re:run(ConnectionName, <<"^192.168.1.1:80 -> 192.168.1.2:81 \\(\\d\\)">>, [{capture, none}]),
     gen_tcp:close(Socket),
     ok.
 
@@ -82,7 +82,7 @@ proxy_protocol_v1_tls(Config) ->
     timer:sleep(1000),
     ConnectionName = rabbit_ct_broker_helpers:rpc(Config, 0,
         ?MODULE, connection_name, []),
-    match = re:run(ConnectionName, <<"^192.168.1.1:80 -> 192.168.1.2:81$">>, [{capture, none}]),
+    match = re:run(ConnectionName, <<"^192.168.1.1:80 -> 192.168.1.2:81 \\(\\d\\)$">>, [{capture, none}]),
     gen_tcp:close(Socket),
     ok.
 
@@ -100,7 +100,7 @@ proxy_protocol_v2_local(Config) ->
     {ok, _Packet} = gen_tcp:recv(Socket, 0, ?TIMEOUT),
     ConnectionName = rabbit_ct_broker_helpers:rpc(Config, 0,
         ?MODULE, connection_name, []),
-    match = re:run(ConnectionName, <<"^127.0.0.1:\\d+ -> 127.0.0.1:\\d+$">>, [{capture, none}]),
+    match = re:run(ConnectionName, <<"^127.0.0.1:\\d+ -> 127.0.0.1:\\d+ \\(\\d\\)$">>, [{capture, none}]),
     gen_tcp:close(Socket),
     ok.
 
@@ -144,7 +144,9 @@ connection_name() ->
     end.
 
 connection_registered() ->
-    length(ets:tab2list(connection_created)) > 0.
+    I = ets:info(connection_created),
+    Size = proplists:get_value(size, I),
+    Size > 0.
 
 retry(_Function, 0) ->
     false;