aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_framework.erl
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2016-06-09 14:40:22 +0200
committerZandra Hird <[email protected]>2016-06-09 14:40:22 +0200
commit75e5cdabbcaaa12f043225ca8d361055a9d47b24 (patch)
tree6c3abd0e228d33dcd7f40d909fda885fea2b8738 /lib/common_test/src/ct_framework.erl
parent6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13 (diff)
parent02564a09a8df4cd0cd8e6e53b7e3a3107e3229d7 (diff)
downloadotp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.tar.gz
otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.tar.bz2
otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.zip
Merge branch 'zandra/common_test/unmatched_returns/OTP-13345'
* zandra/common_test/unmatched_returns/OTP-13345: (23 commits) ct logs: Fix unmatched_return warnings ct_util: Fix unmatched_return warnings erl2html2: Fix unmatched_return warnings cth_conn_log: Fix unmatched_return warnings ct_webtool: Fix unmatched_return warnings ct_telnet: Fix unmatched_return warnings ct_ssh: Fix unmatched_return warnings ct_snmp: Fix unmatched_return warnings ct_slave: Fix unmatched_return warnings ct_rpc: Fix unmatched_return warnings ct_repeat: Fix unmatched_return warnings ct_release_test: Fix unmatched_return warnings ct_property_test: Fix unmatched_return warnings ct_master: Fix unmatched_return warnings ct_hooks_lock: Fix unmatched_return warnings ct_hooks: Fix unmatched_return warnings ct_groups: Fix unmatched_return warnings ct_ftp: Fix unmatched_return warnings ct_framework: Fix unmatched_return warnings ct_config: Fix unmatched_return warnings ...
Diffstat (limited to 'lib/common_test/src/ct_framework.erl')
-rw-r--r--lib/common_test/src/ct_framework.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index eb32f7f3fc..104515e57e 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -128,7 +128,7 @@ init_tc1(?MODULE,_,error_in_suite,_,[Config0]) when is_list(Config0) ->
ct_event:notify(#event{name=tc_start,
node=node(),
data={?MODULE,error_in_suite}}),
- ct_suite_init(?MODULE,error_in_suite,[],Config0),
+ _ = ct_suite_init(?MODULE,error_in_suite,[],Config0),
case ?val(error,Config0) of
undefined ->
{fail,"unknown_error_in_suite"};
@@ -212,7 +212,7 @@ init_tc2(Mod,Suite,Func,HookFunc,SuiteInfo,MergeResult,Config) ->
%% timetrap must be handled before require
MergedInfo = timetrap_first(MergeResult, [], []),
%% tell logger to use specified style sheet
- case lists:keysearch(stylesheet,1,MergeResult++Config) of
+ _ = case lists:keysearch(stylesheet,1,MergeResult++Config) of
{value,{stylesheet,SSFile}} ->
ct_logs:set_stylesheet(Func,add_data_dir(SSFile,Config));
_ ->
@@ -632,10 +632,10 @@ try_set_default(Name,Key,Info,Where) ->
{_,[]} ->
no_default;
{'_UNDEF',_} ->
- [ct_config:set_default_config([CfgVal],Where) || CfgVal <- CfgElems],
+ _ = [ct_config:set_default_config([CfgVal],Where) || CfgVal <- CfgElems],
ok;
_ ->
- [ct_config:set_default_config(Name,[CfgVal],Where) || CfgVal <- CfgElems],
+ _ = [ct_config:set_default_config(Name,[CfgVal],Where) || CfgVal <- CfgElems],
ok
end.
@@ -1315,7 +1315,7 @@ report(What,Data) ->
%% top level test index page needs to be refreshed
TestName = filename:basename(?val(topdir, Data), ".logs"),
RunDir = ?val(rundir, Data),
- ct_logs:make_all_suites_index({TestName,RunDir}),
+ _ = ct_logs:make_all_suites_index({TestName,RunDir}),
ok;
tests_start ->
ok;