Fix test

Author: acogoluegnes

test/osiris_log_SUITE.erl

@@ -414,10 +414,10 @@ read_ahead(Config) ->
              W1;
         (read, #{r := R0, tracer := T}) ->
              %% first chunk, we read the header and the chunk
-             {ok, R1} = osiris_log:send_file(CS, R0),
-             {ok, Read} = gen_tcp:recv(SS, 0),
              Entries = [<<"hiiiiiiiii">>, <<"hooooooo">>],
              [_, _, D, _] = fake_chunk(Entries, ?LINE, 1, 100),
+             {ok, R1} = osiris_log:send_file(CS, R0),
+             {ok, Read} = recv(SS, byte_size(iolist_to_binary(D)) + HS),
              ?assertEqual(iolist_to_binary(D), binary:part(Read, HS, byte_size(Read) - HS)),
              ?assertEqual(2, length(osiris_tracer:calls(T))),
              R1
@@ -427,9 +427,9 @@ read_ahead(Config) ->
              W1;
         (read, #{r := R0, tracer := T}) ->
              %% small chunk, we read it ahead already
-             {ok, R1} = osiris_log:send_file(CS, R0),
-             {ok, Read} = gen_tcp:recv(SS, 0),
              [_, _, D, _] = fake_chunk([<<"hi">>, <<"ho">>], ?LINE, 1, 100),
+             {ok, R1} = osiris_log:send_file(CS, R0),
+             {ok, Read} = recv(SS, byte_size(iolist_to_binary(D)) + HS),
              ?assertEqual(iolist_to_binary(D), binary:part(Read, HS, byte_size(Read) - HS)),
              ?assertEqual(0, length(osiris_tracer:calls(T))),
              R1
@@ -440,10 +440,10 @@ read_ahead(Config) ->
              W1;
         (read, #{r := R0, tracer := T}) ->
              %% large chunk, we will need to read from the file system
-             {ok, R1} = osiris_log:send_file(CS, R0),
-             {ok, Read} = gen_tcp:recv(SS, 0),
              Entries = [<<"foo">>, binary:copy(<<"b">>, RAL * 2)],
              [_, _, D, _] = fake_chunk(Entries, ?LINE, 1, 100),
+             {ok, R1} = osiris_log:send_file(CS, R0),
+             {ok, Read} = recv(SS, byte_size(iolist_to_binary(D)) + HS),
              ?assertEqual(iolist_to_binary(D), binary:part(Read, HS, byte_size(Read) - HS)),
              ?assertEqual(0, length(osiris_tracer:calls(T, file, pread))),
              ?assertEqual(1, length(osiris_tracer:calls(T, file, sendfile))),
@@ -2383,3 +2383,19 @@ fake_chunk(Blobs, Ts, Epoch, NextChId, FSize) ->
     element(1,
             osiris_log:make_chunk(Blobs, <<>>, 0, Ts, Epoch, NextChId,
                                   FSize)).
+
+recv(Socket, Expected) ->
+    recv(Socket, Expected, <<>>).
+
+recv(_Socket, 0, Acc) ->
+    Acc;
+recv(Socket, Expected, Acc) ->
+    case gen_tcp:recv(Socket, Expected, 10_000) of
+        {ok, Data} when byte_size(Data) == Expected ->
+            {ok, Data};
+        {ok, Data} when byte_size(Data) < Expected ->
+            {ok, recv(Socket, Expected - byte_size(Data),
+                      <<Acc/binary, Data/binary>>)};
+        Other ->
+            Other
+    end.