aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-11-23 17:37:40 +0100
committerLukas Larsson <[email protected]>2010-12-08 18:07:51 +0100
commit53196e4720f316800eedaec2ce4792683cb3c80e (patch)
tree24e74b6cd59c44223dd8122cf97328399ddea6f5 /lib
parenteeb9e92f290a8a9d3431c541c2548bff5ad7c98f (diff)
downloadotp-53196e4720f316800eedaec2ce4792683cb3c80e.tar.gz
otp-53196e4720f316800eedaec2ce4792683cb3c80e.tar.bz2
otp-53196e4720f316800eedaec2ce4792683cb3c80e.zip
Remove scope_tc test case as it should not be possble to have this scope
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/test/ct_suite_callback_SUITE.erl38
-rw-r--r--lib/common_test/test/ct_suite_callback_SUITE_data/scb/tests/ct_scope_tc_scb_SUITE.erl110
2 files changed, 4 insertions, 144 deletions
diff --git a/lib/common_test/test/ct_suite_callback_SUITE.erl b/lib/common_test/test/ct_suite_callback_SUITE.erl
index e4bc524162..4e5ecfab76 100644
--- a/lib/common_test/test/ct_suite_callback_SUITE.erl
+++ b/lib/common_test/test/ct_suite_callback_SUITE.erl
@@ -73,9 +73,10 @@ all(suite) ->
lists:reverse(
[
one_scb, two_scb, faulty_scb_no_init, minimal_scb,
- minimal_and_maximal_scb, faulty_scb_undef%, scope_per_suite_scb,
-% scope_per_tc_scb, scope_per_group_scb, scope_suite_scb,
-% fail_pre_suite_scb, fail_post_suite_scb, skip_pre_suite_scb, skip_post_suite_scb
+ minimal_and_maximal_scb, faulty_scb_undef, scope_per_suite_scb,
+ scope_per_group_scb, scope_suite_scb%,
+% fail_pre_suite_scb, fail_post_suite_scb, skip_pre_suite_scb,
+% skip_post_suite_scb
]).
@@ -115,10 +116,6 @@ scope_suite_scb(Config) when is_list(Config) ->
do_test(scope_suite_scb, "ct_scope_suite_scb_SUITE.erl",
[],Config).
-scope_per_tc_scb(Config) when is_list(Config) ->
- do_test(scope_per_tc_scb, "ct_scope_per_tc_scb_SUITE.erl",
- [],Config).
-
scope_per_group_scb(Config) when is_list(Config) ->
do_test(scope_per_group_scb, "ct_scope_per_group_scb_SUITE.erl",
[],Config).
@@ -139,14 +136,6 @@ skip_post_suite_scb(Config) ->
do_test(skip_post_suite_scb, "ct_scb_empty_SUITE.erl",
[skip_post_suite_scb],Config).
-scope_tc_scb(Config) when is_list(Config) ->
- do_test(scope_tc_scb, "ct_scope_tc_scb_SUITE.erl",
- [],Config).
-
-scope_group_scb(Config) when is_list(Config) ->
- do_test(scope_group_scb, "ct_scope_group_scb_SUITE.erl",
- [],Config).
-
%%%-----------------------------------------------------------------
%%% HELP FUNCTIONS
%%%-----------------------------------------------------------------
@@ -383,25 +372,6 @@ test_events(scope_suite_scb) ->
{?eh,stop_logging,[]}
];
-test_events(scope_per_tc_scb) ->
- [
- {?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,tc_start,{ct_scope_per_tc_scb_SUITE,init_per_suite}},
- {?eh,tc_done,{ct_scope_per_tc_scb_SUITE,init_per_suite,ok}},
-
- {?eh,tc_start,{ct_scope_per_tc_scb_SUITE,test_case}},
- {?eh,scb,{empty_scb,init,[[]]}},
- {?eh,scb,{empty_scb,post_end_per_testcase,[test_case,[]]}},
- {?eh,scb,{empty_scb,terminate,[[]]}},
- {?eh,tc_done,{ct_scope_per_tc_scb_SUITE,test_case,ok}},
-
- {?eh,tc_start,{ct_scope_per_tc_scb_SUITE,end_per_suite}},
- {?eh,tc_done,{ct_scope_per_tc_scb_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
- {?eh,stop_logging,[]}
- ];
-
test_events(scope_per_group_scb) ->
[
{?eh,start_logging,{'DEF','RUNDIR'}},
diff --git a/lib/common_test/test/ct_suite_callback_SUITE_data/scb/tests/ct_scope_tc_scb_SUITE.erl b/lib/common_test/test/ct_suite_callback_SUITE_data/scb/tests/ct_scope_tc_scb_SUITE.erl
deleted file mode 100644
index cb894e49e4..0000000000
--- a/lib/common_test/test/ct_suite_callback_SUITE_data/scb/tests/ct_scope_tc_scb_SUITE.erl
+++ /dev/null
@@ -1,110 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010. 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(ct_scope_tc_scb_SUITE).
-
--suite_defaults([{timetrap, {minutes, 10}}]).
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--include("ct.hrl").
-
-%% Test server callback functions
-%%--------------------------------------------------------------------
-%% @doc
-%% Config - [tuple()]
-%% A list of key/value pairs, holding the test case configuration.
-%%
-%% Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%
-%% @spec init_per_suite(Config) -> Config
-%% @end
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
- Config.
-
-%%--------------------------------------------------------------------
-%% @doc
-%% Config - [tuple()]
-%% A list of key/value pairs, holding the test case configuration.
-%%
-%% Cleanup after the whole suite
-%%
-%% @spec end_per_suite(Config) -> _
-%% @end
-%%--------------------------------------------------------------------
-end_per_suite(_Config) ->
- ok.
-
-%%--------------------------------------------------------------------
-%% @doc
-%% Case - atom()
-%% Name of the test case that is about to be run.
-%% Config - [tuple()]
-%% A list of key/value pairs, holding the test case configuration.
-%%
-%% Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%% Initiation before each test case
-%%
-%% @spec init_per_testcase(TestCase, Config) -> Config
-%% @end
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config) ->
- [{suite_callbacks,[empty_scb]}|Config].
-
-%%--------------------------------------------------------------------
-%% @doc
-%% Case - atom()
-%% Name of the test case that is about to be run.
-%% Config - [tuple()]
-%% A list of key/value pairs, holding the test case configuration.
-%%
-%% Cleanup after each test case
-%%
-%% @spec end_per_testcase(TestCase, Config) -> _
-%% @end
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, _Config) ->
- ok.
-
-%%--------------------------------------------------------------------
-%% @doc
-%% TestCases - [Case]
-%% Case - atom()
-%% Name of a test case.
-%%
-%% Returns a list of all test cases in this test suite
-%%
-%% @spec all() -> TestCases
-%% @end
-%%--------------------------------------------------------------------
-all() ->
- [test_case].
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-test_case(Config) when is_list(Config) ->
- ok.