aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-02-26 15:36:52 +0100
committerSiri Hansen <[email protected]>2013-03-04 11:05:34 +0100
commit6ab4b1c2a7a5a89dd8ea4094bd7fb4c23745acfc (patch)
treed881f59174073af1ce098e0571ddf733526ab8ad
parent4469c7d0cb3ba5d3c404ebd13097072d8b531091 (diff)
downloadotp-6ab4b1c2a7a5a89dd8ea4094bd7fb4c23745acfc.tar.gz
otp-6ab4b1c2a7a5a89dd8ea4094bd7fb4c23745acfc.tar.bz2
otp-6ab4b1c2a7a5a89dd8ea4094bd7fb4c23745acfc.zip
[observer] Extend timer to allow trace msgs to arrive over tcp/ip
Some tests fail (mostly on windows) every now and then with too few trace messages in log. Extending the timer from 200 to 500 ms to see if this is the reason. Plus removing a compiler warning in ttb_SUITE.
-rw-r--r--lib/observer/test/ttb_SUITE.erl5
-rw-r--r--lib/observer/test/ttb_helper.erl2
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index 695d41b48a..f3fcd9f283 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -1,7 +1,8 @@
+%%
%% %CopyrightBegin%
%%
%%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -57,7 +58,7 @@ init_per_testcase(Case, Config) ->
catch error:undef -> ok
end,
[{watchdog, Dog}|Config].
-end_per_testcase(Case, Config) ->
+end_per_testcase(_Case, Config) ->
%% try apply(?MODULE,Case,[cleanup,Config])
%% catch error:undef -> ok
%% end,
diff --git a/lib/observer/test/ttb_helper.erl b/lib/observer/test/ttb_helper.erl
index 76b06cd3ce..05f6d73aef 100644
--- a/lib/observer/test/ttb_helper.erl
+++ b/lib/observer/test/ttb_helper.erl
@@ -70,7 +70,7 @@ msgs(N) ->
msgs_ip(N) ->
[c(client, put, [test_msg]) || _ <- lists:seq(1, N)],
s(server, received, [a,b]),
- timer:sleep(200). %% allow trace messages to arrive over tcp/ip
+ timer:sleep(500). %% allow trace messages to arrive over tcp/ip
run() ->
ttb({local, "A"}),