aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-10-05 17:19:26 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-10-08 16:43:36 +0200
commitbae975e50a2270a267790f95fe918b71f688d2dc (patch)
tree894236fe98a60e7f81e87e32161faffbc5550cc3
parent6c031990aff7fbae45e45251f863d04ade4d39a1 (diff)
downloadotp-bae975e50a2270a267790f95fe918b71f688d2dc.tar.gz
otp-bae975e50a2270a267790f95fe918b71f688d2dc.tar.bz2
otp-bae975e50a2270a267790f95fe918b71f688d2dc.zip
test_server: Let start_node/3 utilize scalefactor
* test_server_node:start_node/3 now uses timetrap_scale_factor for timeouts (peer nodes)
-rw-r--r--lib/test_server/src/test_server_node.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 17c02dfbe5..872f15f2be 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -424,10 +424,12 @@ start_node_peer(SlaveName, OptList, From, TI) ->
%% Bad environment can cause open port to fail. If this happens,
%% we ignore it and let the testcase handle the situation...
catch open_port({spawn, Cmd}, [stream|Opts]),
+
+ Tmo = 60000 * test_server:timetrap_scale_factor(),
case start_node_get_option_value(wait, OptList, true) of
true ->
- Ret = wait_for_node_started(LSock,60000,undefined,Cleanup,TI,self()),
+ Ret = wait_for_node_started(LSock,Tmo,undefined,Cleanup,TI,self()),
case {Ret,FailOnError} of
{{{ok, Node}, Warning},_} ->
gen_server:reply(From,{{ok,Node},HostStr,Cmd,[],Warning});
@@ -443,7 +445,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
Self = self(),
spawn_link(
fun() ->
- wait_for_node_started(LSock,60000,undefined,
+ wait_for_node_started(LSock,Tmo,undefined,
Cleanup,TI,Self),
receive after infinity -> ok end
end),