From 6b7463094db2ec3c2c0e4f8784dcd64ef186c96b Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 16 Feb 2017 15:38:05 +0100
Subject: [ct] Fix faulty hook callbacks for skipped tests

The following bugs are corrected:

* Tests that were skipped before calling pre_init_per_* got faulty
  calls to the corresponding post_init_per_*. E.g. if a test was
  skipped because suite/0 returned a 'require' statement that was not
  fulfilled, then post_init_per_suite would be called, even though
  pre_init_per_suite and init_per_suite were not called.

* Tests that were skipped before or in init_per_testcase got faulty
  calls to pre_end_per_testcase and post_end_per_testcase
  (end_per_testcase is not called in these situations).

Test are added to make sure that the expected callbacks, and only
those, are called when tests are skipped in different ways.

Conflicts:
	lib/common_test/test/ct_hooks_SUITE.erl
---
 .../cth/tests/skip_init_SUITE.erl                  | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_init_SUITE.erl

(limited to 'lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_init_SUITE.erl')

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_init_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_init_SUITE.erl
new file mode 100644
index 0000000000..70305421ac
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_init_SUITE.erl
@@ -0,0 +1,53 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(skip_init_SUITE).
+
+-compile(export_all).
+
+-include("ct.hrl").
+
+suite() ->
+    [].
+
+init_per_suite(Config) ->
+    {skip,"Skipped in init_per_suite/1"}.
+
+end_per_suite(Config) ->
+    ok.
+
+init_per_group(_,Config) ->
+    Config.
+
+end_per_group(_,_) ->
+    ok.
+
+init_per_testcase(_,Config) ->
+    Config.
+
+end_per_testcase(_,_) ->
+    ok.
+
+all() ->
+    [test_case].
+
+%% Test cases starts here.
+test_case(Config) ->
+    ok.
-- 
cgit v1.2.3