aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_event_handler_SUITE_data
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2015-03-06 12:13:55 +0100
committerPeter Andersson <[email protected]>2015-03-06 12:13:55 +0100
commite6d39e161f14f5d9a4dc9c44ee1f31b47343567a (patch)
tree48bb13703a3976f4b035981375a929b08ecbe5d8 /lib/common_test/test/ct_event_handler_SUITE_data
parente725cd9385f269b501ebc3ca31999ac69706b535 (diff)
parenteb8b95db65b701ceed13d34350fe2f635d7d9eb5 (diff)
downloadotp-e6d39e161f14f5d9a4dc9c44ee1f31b47343567a.tar.gz
otp-e6d39e161f14f5d9a4dc9c44ee1f31b47343567a.tar.bz2
otp-e6d39e161f14f5d9a4dc9c44ee1f31b47343567a.zip
Merge remote-tracking branch 'origin/peppe/common_test/inconsistent_return_value' into maint
* origin/peppe/common_test/inconsistent_return_value: Add tests Make it possible to skip test case by returning skipped tag OTP-12359
Diffstat (limited to 'lib/common_test/test/ct_event_handler_SUITE_data')
-rw-r--r--lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
index 16b7129993..a52fe96f30 100644
--- a/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
@@ -124,7 +124,7 @@ end_per_testcase(_TestCase, _Config) ->
%% Description: Returns the list of test cases that are to be executed.
%%--------------------------------------------------------------------
all() ->
- [tc1, tc2, tc3].
+ [tc1, tc2, tc3, tc4].
%%--------------------------------------------------------------------
@@ -135,7 +135,10 @@ tc1(_Config) ->
ok.
tc2(_Config) ->
- {skip,"Skipped"}.
+ {skip,"Skip"}.
-tc3(_Config) ->
+tc3(_Config) ->
+ {skipped,"Skipped"}.
+
+tc4(_Config) ->
exit('Failing').