Merge branch 'maint'

2 files changed, 37 insertions, 28 deletions

diff --git a/lib/ssh/test/property_test/ssh_eqc_client_server.erl b/lib/ssh/test/property_test/ssh_eqc_client_server.erl
index cf895ae85e..123b48412b 100644
--- a/lib/ssh/test/property_test/ssh_eqc_client_server.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_client_server.erl
@@ -32,6 +32,10 @@
 -else.
 
 
+%% Limit the testing time on CI server... this needs to be improved in % from total budget.
+-define(TESTINGTIME(Prop), eqc:testing_time(30,Prop)).
+  
+
 -include_lib("eqc/include/eqc.hrl").
 -include_lib("eqc/include/eqc_statem.hrl").
 -eqc_group_commands(true).
@@ -75,7 +79,9 @@
 
 -define(SUBSYSTEMS, ["echo1", "echo2", "echo3", "echo4"]).
 
--define(SERVER_ADDRESS, { {127,1,1,1}, inet_port({127,1,1,1}) }).
+-define(SERVER_ADDRESS,   { {127,1,0,choose(1,254)},  % IP
+			    choose(1024,65535)        % Port
+			  }).
 
 -define(SERVER_EXTRA_OPTIONS,  [{parallel_login,bool()}] ).
 		
@@ -97,7 +103,7 @@
 
 %% To be called as eqc:quickcheck( ssh_eqc_client_server:prop_seq() ).
 prop_seq() ->
-    do_prop_seq(?SSH_DIR).
+  ?TESTINGTIME(do_prop_seq(?SSH_DIR)).
 
 %% To be called from a common_test test suite
 prop_seq(CT_Config) ->
@@ -105,9 +111,10 @@ prop_seq(CT_Config) ->
 
 
 do_prop_seq(DataDir) ->
-    ?FORALL(Cmds,commands(?MODULE, #state{data_dir=DataDir}),
+    setup_rsa(DataDir),
+    ?FORALL(Cmds,commands(?MODULE),
 	    begin
-		{H,Sf,Result} = run_commands(?MODULE,Cmds),
+		{H,Sf,Result} = run_commands(?MODULE,Cmds,[{data_dir,DataDir}]),
 		present_result(?MODULE, Cmds, {H,Sf,Result}, Result==ok)
 	    end).
 
@@ -116,33 +123,35 @@ full_path(SSHdir, CT_Config) ->
 		  SSHdir).
 %%%----
 prop_parallel() ->
-    do_prop_parallel(?SSH_DIR).
+    ?TESTINGTIME(do_prop_parallel(?SSH_DIR)).
 
 %% To be called from a common_test test suite
 prop_parallel(CT_Config) ->
     do_prop_parallel(full_path(?SSH_DIR, CT_Config)).
 
 do_prop_parallel(DataDir) ->
-    ?FORALL(Cmds,parallel_commands(?MODULE, #state{data_dir=DataDir}),
+    setup_rsa(DataDir),
+    ?FORALL(Cmds,parallel_commands(?MODULE),
 	    begin
-		{H,Sf,Result} = run_parallel_commands(?MODULE,Cmds),
+		{H,Sf,Result} = run_parallel_commands(?MODULE,Cmds,[{data_dir,DataDir}]),
 		present_result(?MODULE, Cmds, {H,Sf,Result}, Result==ok)
 	    end).
 
 %%%----
 prop_parallel_multi() ->
-    do_prop_parallel_multi(?SSH_DIR).
+    ?TESTINGTIME(do_prop_parallel_multi(?SSH_DIR)).
 
 %% To be called from a common_test test suite
 prop_parallel_multi(CT_Config) ->
     do_prop_parallel_multi(full_path(?SSH_DIR, CT_Config)).
 
 do_prop_parallel_multi(DataDir) ->
+    setup_rsa(DataDir),
     ?FORALL(Repetitions,?SHRINK(1,[10]),
-	    ?FORALL(Cmds,parallel_commands(?MODULE, #state{data_dir=DataDir}),
+	    ?FORALL(Cmds,parallel_commands(?MODULE),
 		    ?ALWAYS(Repetitions,
 			    begin
-				{H,Sf,Result} = run_parallel_commands(?MODULE,Cmds),
+				{H,Sf,Result} = run_parallel_commands(?MODULE,Cmds,[{data_dir,DataDir}]),
 				present_result(?MODULE, Cmds, {H,Sf,Result}, Result==ok)
 			    end))).
 
@@ -151,14 +160,12 @@ do_prop_parallel_multi(DataDir) ->
 
 %%% called when using commands/1
 initial_state() -> 
-    S = initial_state(#state{}),
-    S#state{initialized=true}.
+  #state{}.
 
 %%% called when using commands/2
-initial_state(S) ->
+initial_state(DataDir) ->
     application:stop(ssh),
-    ssh:start(),
-    setup_rsa(S#state.data_dir).
+    ssh:start().
 
 %%%----------------
 weight(S, ssh_send) -> 5*length([C || C<-S#state.channels, has_subsyst(C)]);
@@ -172,7 +179,7 @@ weight(_S, _) -> 1.
 
 initial_state_pre(S) -> not S#state.initialized.
 
-initial_state_args(S) -> [S].
+initial_state_args(_) -> [{var,data_dir}].
 
 initial_state_next(S, _, _) -> S#state{initialized=true}.
 
@@ -180,10 +187,17 @@ initial_state_next(S, _, _) -> S#state{initialized=true}.
 %%% Start a new daemon
 %%% Precondition: not more than ?MAX_NUM_SERVERS started
 
+%%% This is a bit funny because we need to pick an IP address and Port to
+%%% run the server on, but there is no way to atomically select a free Port!
+%%% 
+%%% Therefore we just grab one IP-Port pair randomly and try to start the ssh server
+%%% on that pair.  If it fails, we just forget about it and goes on.  Yes, it
+%%% is a waste of cpu cycles, but at least it works!
+
 ssh_server_pre(S) -> S#state.initialized andalso 
 			 length(S#state.servers) < ?MAX_NUM_SERVERS.
 
-ssh_server_args(S) -> [?SERVER_ADDRESS, S#state.data_dir, ?SERVER_EXTRA_OPTIONS]. 
+ssh_server_args(_) -> [?SERVER_ADDRESS, {var,data_dir}, ?SERVER_EXTRA_OPTIONS]. 
 
 ssh_server({IP,Port}, DataDir, ExtraOptions) ->
     ok(ssh:daemon(IP, Port, 
@@ -194,8 +208,10 @@ ssh_server({IP,Port}, DataDir, ExtraOptions) ->
 		   | ExtraOptions
 		  ])).
 
+ssh_server_post(_S, _Args, {error,eaddrinuse}) -> true;
 ssh_server_post(_S, _Args, Result) -> is_ok(Result).
 
+ssh_server_next(S, {error,eaddrinuse}, _) -> S;
 ssh_server_next(S, Result, [{IP,Port},_,_]) ->
     S#state{servers=[#srvr{ref = Result,
 			   address = IP,
@@ -241,15 +257,16 @@ do(Pid, Fun, Timeout) when is_function(Fun,0) ->
 
 ssh_open_connection_pre(S) -> S#state.servers /= [].
     
-ssh_open_connection_args(S) -> [oneof(S#state.servers), S#state.data_dir].
+ssh_open_connection_args(S) -> [oneof(S#state.servers), {var,data_dir}].
     
 ssh_open_connection(#srvr{address=Ip, port=Port}, DataDir) ->
     ok(ssh:connect(ensure_string(Ip), Port, 
 		   [
 		    {silently_accept_hosts, true},
 		    {user_dir, user_dir(DataDir)},
-		    {user_interaction, false}
-		   ])).
+		    {user_interaction, false},
+		    {connect_timeout, 2000}
+		   ], 2000)).
 
 ssh_open_connection_post(_S, _Args, Result) -> is_ok(Result).
 
@@ -569,12 +586,6 @@ median(_) ->
 
 %%%================================================================
 %%% The rest is taken and modified from ssh_test_lib.erl
-inet_port(IpAddress)->
-    {ok, Socket} = gen_tcp:listen(0, [{ip,IpAddress},{reuseaddr,true}]),
-    {ok, Port} = inet:port(Socket),
-    gen_tcp:close(Socket),
-    Port.
-
 setup_rsa(Dir) ->
     erase_dir(system_dir(Dir)),
     erase_dir(user_dir(Dir)),
diff --git a/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl b/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl
index 34630bdc91..57ea2012c1 100644
--- a/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl
@@ -25,8 +25,6 @@
 -proptest(eqc).
 -proptest([triq,proper]).
 
--include_lib("ct_property_test.hrl").
-
 -ifndef(EQC).
 -ifndef(PROPER).
 -ifndef(TRIQ).