diff options
| author | Peter Andersson <[email protected]> | 2013-12-03 11:14:40 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-12-03 11:15:13 +0100 |
| commit | 1af2b59ab5102e52ed55cc3afed561daa08eac17 (patch) | |
| tree | 4e08f83225f1ab2cfe611578b39de9ba4147eb23 /lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl | |
| parent | 342d12087e62ffaf239a3a42d503d9e5ec64a83f (diff) | |
| parent | 8b1fddd13a95d0232cfc08f529632d58eb9f4fe6 (diff) | |
| download | otp-1af2b59ab5102e52ed55cc3afed561daa08eac17.tar.gz otp-1af2b59ab5102e52ed55cc3afed561daa08eac17.tar.bz2 otp-1af2b59ab5102e52ed55cc3afed561daa08eac17.zip | |
Merge branch 'peppe/common_test/hook_skip_failure' into maint
* peppe/common_test/hook_skip_failure:
Fix CT hook pre_end_per_group causing crash when returning {skip,Reason}
OTP-11409
Diffstat (limited to 'lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl new file mode 100644 index 0000000000..ece4eb2247 --- /dev/null +++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl @@ -0,0 +1,74 @@ +%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(skip_pre_end_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+ empty_cth:init(Id, Opts).
+
+
+pre_init_per_suite(Suite, Config, State) ->
+ empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+ empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+ empty_cth:pre_end_per_suite(Suite,Config,State),
+ {{skip, "Test skip"}, State}.
+
+post_end_per_suite(Suite,Config,Return,State) ->
+ empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+ empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+ empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+ empty_cth:pre_end_per_group(Group,Config,State),
+ {{skip, "Test skip"}, State}.
+
+post_end_per_group(Group,Config,Return,State) ->
+ empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+ empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+ empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+ empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+ empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+ empty_cth:terminate(State).
|