rebase fixes

post rebase test fixes

Make socket initialisation more lenient

correct return types

fix

remove commented code

Author: kjnilsson

deps/rabbitmq_stream/src/rabbit_stream_sup.erl

@@ -30,12 +30,12 @@ init([]) ->
     {ok, Listeners} = application:get_env(rabbitmq_stream, tcp_listeners),
     NumTcpAcceptors =
         application:get_env(rabbitmq_stream, num_tcp_acceptors, 10),
-    {ok, SocketOpts} =
-        application:get_env(rabbitmq_stream, tcp_listen_options),
+    SocketOpts =
+        application:get_env(rabbitmq_stream, tcp_listen_options, []),
 
     {ok, SslListeners0} = application:get_env(rabbitmq_stream, ssl_listeners),
-    {ok, SslSocketOpts} =
-        application:get_env(rabbitmq_stream, ssl_listen_options),
+    SslSocketOpts =
+        application:get_env(rabbitmq_stream, ssl_listen_options, []),
     {SslOpts, NumSslAcceptors, SslListeners}
         = case SslListeners0 of
               [] -> {none, 0, []};

deps/rabbitmq_stream/test/commands_SUITE.erl

@@ -128,8 +128,8 @@ list_connections_run(Config) ->
     ?assertEqual([], Keys -- ?INFO_ITEMS),
     ?assertEqual([], ?INFO_ITEMS -- Keys),
 
-    rabbit_stream_SUITE:test_close(S1, C1),
-    rabbit_stream_SUITE:test_close(S2, C2),
+    rabbit_stream_SUITE:test_close(gen_tcp, S1, C1),
+    rabbit_stream_SUITE:test_close(gen_tcp, S2, C2),
     ok.
 
 list_consumers_merge_defaults(_Config) ->
@@ -271,22 +271,22 @@ list_publishers_run(Config) ->
     ok.
 
 create_stream(S, Stream, C0) ->
-    rabbit_stream_SUITE:test_create_stream(S, Stream, C0).
+    rabbit_stream_SUITE:test_create_stream(gen_tcp, S, Stream, C0).
 
 subscribe(S, SubId, Stream, C) ->
-    rabbit_stream_SUITE:test_subscribe(S, SubId, Stream, C).
+    rabbit_stream_SUITE:test_subscribe(gen_tcp, S, SubId, Stream, C).
 
 declare_publisher(S, PubId, Stream, C) ->
-    rabbit_stream_SUITE:test_declare_publisher(S, PubId, Stream, C).
+    rabbit_stream_SUITE:test_declare_publisher(gen_tcp, S, PubId, Stream, C).
 
 delete_stream(S, Stream, C) ->
-    rabbit_stream_SUITE:test_delete_stream(S, Stream, C).
+    rabbit_stream_SUITE:test_delete_stream(gen_tcp, S, Stream, C).
 
 metadata_update_stream_deleted(S, Stream, C) ->
-    rabbit_stream_SUITE:test_metadata_update_stream_deleted(S, Stream, C).
+    rabbit_stream_SUITE:test_metadata_update_stream_deleted(gen_tcp, S, Stream, C).
 
 close(S, C) ->
-    rabbit_stream_SUITE:test_close(S, C).
+    rabbit_stream_SUITE:test_close(gen_tcp, S, C).
 
 options(Config) ->
     Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
@@ -334,8 +334,8 @@ start_stream_connection(Port) ->
     {ok, S} =
         gen_tcp:connect("localhost", Port, [{active, false}, {mode, binary}]),
     C0 = rabbit_stream_core:init(0),
-    C1 = rabbit_stream_SUITE:test_peer_properties(S, C0),
-    C = rabbit_stream_SUITE:test_authenticate(S, C1),
+    C1 = rabbit_stream_SUITE:test_peer_properties(gen_tcp, S, C0),
+    C = rabbit_stream_SUITE:test_authenticate(gen_tcp, S, C1),
     {S, C}.
 
 start_amqp_connection(Type, Node, Port) ->

deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

@@ -200,7 +200,6 @@ test_server(Transport, Port) ->
     C6 = test_subscribe(Transport, S, SubscriptionId, Stream, C5),
     C7 = test_deliver(Transport, S, SubscriptionId, Body, C6),
     C8 = test_delete_stream(Transport, S, Stream, C7),
-    % test_metadata_update_stream_deleted(S, Stream),
     _C9 = test_close(Transport, S, C8),
     closed = wait_for_socket_close(Transport, S, 10),
     ok.
@@ -280,7 +279,7 @@ test_delete_stream(Transport, S, Stream, C0) ->
     ?assertMatch({response, 1, {delete_stream, ?RESPONSE_CODE_OK}}, Cmd),
     case MaybeMetaData of
         [] ->
-            test_metadata_update_stream_deleted(S, Stream, C1);
+            test_metadata_update_stream_deleted(Transport, S, Stream, C1);
         [Meta] ->
             {metadata_update, Stream, ?RESPONSE_CODE_STREAM_NOT_AVAILABLE} =
                 Meta,
@@ -343,22 +342,6 @@ test_deliver(Transport, S, SubscriptionId, Body, C0) ->
         Chunk,
     C.
 
-test_metadata_update_stream_deleted(S, Stream) ->
-    test_metadata_update_stream_deleted(gen_tcp, S, Stream).
-
-test_metadata_update_stream_deleted(Transport, S, Stream) ->
-    StreamSize = byte_size(Stream),
-    FrameSize = 2 + 2 + 2 + 2 + StreamSize,
-    {ok,
-     <<FrameSize:32,
-       ?REQUEST:1,
-       ?COMMAND_METADATA_UPDATE:15,
-       ?VERSION_1:16,
-       ?RESPONSE_CODE_STREAM_NOT_AVAILABLE:16,
-       StreamSize:16,
-       Stream/binary>>} =
-        Transport:recv(S, 0, 5000).
-
 test_close(Transport, S, C0) ->
     CloseReason = <<"OK">>,
     CloseFrame =