ftp: Correct test case

Test case can not make assumptions on how many chunks will delivered
from the underlaying TCP stream.

Some code commented out that should be used in some form to create
a new test case. There might be other issues than the one fixed in
the previous commit.

1 files changed, 35 insertions, 32 deletions

diff --git a/lib/ftp/test/ftp_SUITE.erl b/lib/ftp/test/ftp_SUITE.erl
index 7c87d5cbdb..81147b5821 100644
--- a/lib/ftp/test/ftp_SUITE.erl
+++ b/lib/ftp/test/ftp_SUITE.erl
@@ -669,9 +669,9 @@ recv_chunk(Config0) ->
     Contents = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
     Config = set_state([reset, {mkfile,File,Contents}], Config0),
     Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    {error, "ftp:recv_chunk_start/2 not called"} = do_recv_chunk(Pid),
     ok = ftp:recv_chunk_start(Pid, id2ftp(File,Config)),
-    {ok, ReceivedContents, _Ncunks} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents} = do_recv_chunk(Pid),
     find_diff(ReceivedContents, Contents).
 
 recv_chunk_twice() ->
@@ -683,11 +683,11 @@ recv_chunk_twice(Config0) ->
     Contents2 = crypto:strong_rand_bytes(1200),
     Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}], Config0),
     Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    {error, "ftp:recv_chunk_start/2 not called"} = do_recv_chunk(Pid),
     ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
-    {ok, ReceivedContents1, _Ncunks1} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents1} = do_recv_chunk(Pid),
     ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
-    {ok, ReceivedContents2, _Ncunks2} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents2} = do_recv_chunk(Pid),
     find_diff(ReceivedContents1, Contents1),
     find_diff(ReceivedContents2, Contents2).
 
@@ -704,47 +704,50 @@ recv_chunk_three_times(Config0) ->
 
     Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}, {mkfile,File3,Contents3}], Config0),
     Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    {error, "ftp:recv_chunk_start/2 not called"} = do_recv_chunk(Pid),
 
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File3,Config)),
+    {ok, ReceivedContents3} = do_recv_chunk(Pid),
+    
     ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
-    {ok, ReceivedContents1, Nchunks1} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents1} = do_recv_chunk(Pid),
 
     ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
-    {ok, ReceivedContents2, _Nchunks2} = recv_chunk(Pid, <<>>),
-
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File3,Config)),
-    {ok, ReceivedContents3, _Nchunks3} = recv_chunk(Pid, <<>>, 10000, 0, Nchunks1),
+    {ok, ReceivedContents2} = do_recv_chunk(Pid),
 
     find_diff(ReceivedContents1, Contents1),
     find_diff(ReceivedContents2, Contents2),
     find_diff(ReceivedContents3, Contents3).
 
 
-
+do_recv_chunk(Pid) -> 
+    recv_chunk(Pid, <<>>).
 recv_chunk(Pid, Acc) -> 
-    recv_chunk(Pid, Acc, 0, 0, undefined).
-
-
-
-%% ExpectNchunks :: integer() | undefined
-recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) when N+1 < ExpectNchunks ->
-    %% for all I in integer(), I < undefined
-    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks);
-
-recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
-    %% N >= ExpectNchunks-1
-    timer:sleep(DelayMilliSec),
-    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks).
-
-
-recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
-    ct:log("Call ftp:recv_chunk",[]),
     case ftp:recv_chunk(Pid) of
-	ok -> {ok, Acc, N};
-	{ok, Bin} -> recv_chunk(Pid, <<Acc/binary, Bin/binary>>, DelayMilliSec, N+1, ExpectNchunks);
-	Error -> {Error, N}
+	ok -> 
+            {ok, Acc};
+	{ok, Bin} -> 
+            recv_chunk(Pid, <<Acc/binary, Bin/binary>>);
+	Error -> 
+            Error
     end.
 
+%% Make new test case that uses this or new code
+%% only test one thing at the time
+%% delay_recv_chunk(Pid) -> 
+%%     delay_recv_chunk(Pid, <<>>).
+%% delay_recv_chunk(Pid, Acc) -> 
+%%     ct:pal("FOO ~p", [byte_size(Acc)]),
+%%     case ftp:recv_chunk(Pid) of
+%% 	ok -> 
+%%             {ok, Acc};
+%% 	{ok, Bin} -> 
+%%             ct:sleep(100),
+%%             delay_recv_chunk(Pid, <<Acc/binary, Bin/binary>>);
+%% 	Error -> 
+%%             Error
+%%     end.
+
 %%-------------------------------------------------------------------------
 type() -> 
     [{doc,"Test that we can change btween ASCCI and binary transfer mode"}].