aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-01-10 09:10:34 +0100
committerSiri Hansen <[email protected]>2013-01-10 09:10:34 +0100
commit4cd517c8168b2bdf7b38544e91afc14b535b3989 (patch)
tree2183ba45d648c61f7d507b81b6cfed175b1652df /lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
parent95a477e970cbf88a336408335a482938c12e2e27 (diff)
parent808ec6e48837ea6f13eda9ab403cc3da220137c8 (diff)
downloadotp-4cd517c8168b2bdf7b38544e91afc14b535b3989.tar.gz
otp-4cd517c8168b2bdf7b38544e91afc14b535b3989.tar.bz2
otp-4cd517c8168b2bdf7b38544e91afc14b535b3989.zip
Merge branch 'siri/cross-cover/OTP-9870'
* siri/cross-cover/OTP-9870: [test_server] Don't use print/3 in cross_cover_analyse [common_test] Add documentation for cross cover analysis [common_test] Add test case for cross cover mechanism [test_server] Update documentation about cross cover [test_server] Add test of code cover mechanism [test_server,common_test] Fix cross cover mechansim
Diffstat (limited to 'lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl')
-rw-r--r--lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
index 70e30a3334..d9f009679a 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
@@ -41,7 +41,7 @@ init_per_suite(Config) ->
spawn(fun break_and_continue_sup/0),
Config.
-end_per_suite(Config) ->
+end_per_suite(_Config) ->
ok.
init_per_testcase(Case,Config) when Case==break_in_init_tc ->
@@ -90,19 +90,19 @@ break_in_end_tc_after_fail(Config) when is_list(Config) ->
break_in_end_tc_after_abort(Config) when is_list(Config) ->
?t:adjusted_sleep(2000). % will cause a timetrap timeout
-%%%-----------------------------------------------------------------
-%%% Internal functions
-
%% This test case checks that all breaks in previous test cases was
%% also continued, and that the break lasted as long as expected.
%% The reason for this is that some of the breaks above are in
%% end_per_testcase, and failures there will only produce a warning,
%% not an error - so this is to catch the error for real.
-check_all_breaks(Config) ->
+check_all_breaks(Config) when is_list(Config) ->
break_and_continue_sup ! {done,self()},
receive {Breaks,Continued} ->
check_all_breaks(Breaks,Continued)
end.
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
check_all_breaks([{From,Case,T,Start}|Breaks],[{From,End}|Continued]) ->
Diff = timer:now_diff(End,Start),