aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_config_SUITE_data
diff options
context:
space:
mode:
authorAndrey Pampukha <[email protected]>2010-03-25 11:42:26 +0100
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:16 +0200
commit2c711e660df6683eee9cdfeb204e02f093153c36 (patch)
tree9b36be50f3d2d8d4142ca42161b6db6a058c6e11 /lib/common_test/test/ct_config_SUITE_data
parent63b4900da90cd0920b03a9a3dc5f8d8fdbf61ddf (diff)
downloadotp-2c711e660df6683eee9cdfeb204e02f093153c36.tar.gz
otp-2c711e660df6683eee9cdfeb204e02f093153c36.tar.bz2
otp-2c711e660df6683eee9cdfeb204e02f093153c36.zip
Add test suites for ct_master
Also includes minor documentation updates.
Diffstat (limited to 'lib/common_test/test/ct_config_SUITE_data')
-rw-r--r--lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl30
-rw-r--r--lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl30
2 files changed, 2 insertions, 58 deletions
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
index ae66d4e9bf..b7b2e8f16c 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
@@ -18,7 +18,7 @@
%%
%%%-------------------------------------------------------------------
-%%% File: ct_config_SUITE
+%%% File: config_dynamic_SUITE
%%%
%%% Description:
%%% Test suite for common_test which tests the userconfig functionality
@@ -46,33 +46,7 @@ suite() ->
{timetrap, {seconds,10}}
].
-% to get it running on development branch (without userconfig features)
-% function to print full config is in the ct_util, for me it's moved to ct_config
-% two following functions are only for the design period
-% after merging of userconfigs to the main branch ct_config:get_all_config/0
-% should be called instead
-is_exported(Module, Function, Arity)->
- Exports = Module:module_info(exports),
- case lists:keyfind(Function, 1, Exports) of
- false->
- false;
- {Function, Arity}->
- true;
- {Function, _OtherArity}->
- false
- end.
-
-get_all_config()->
- case is_exported(ct_util, get_all_config, 0) of
- true->
- {ct_util, ct_util:get_all_config()};
- false->
- {ct_config, ct_config:get_all_config()}
- end.
-
init_per_suite(Config) ->
- %{Module, Cfg} = get_all_config(),
- %ct:pal("CONFIG (handled by ~p):~n~p", [Module, Cfg]),
Config.
end_per_suite(_) ->
@@ -83,8 +57,6 @@ all() -> [test_get_known_variable, test_localtime_update,
test_disappearable_variable_alias].
init_per_testcase(_, Config) ->
- %{Module, Cfg} = get_all_config(),
- %ct:pal("CONFIG (handled by ~p):~n~p", [Module, Cfg]),
Config.
end_per_testcase(_, _) ->
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
index d3f07980bc..262417fe1c 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
@@ -18,7 +18,7 @@
%%
%%%-------------------------------------------------------------------
-%%% File: config_1_SUITE
+%%% File: config_static_SUITE
%%%
%%% Description:
%%% Test suite for common_test which tests the get_config and require
@@ -49,33 +49,7 @@ suite() ->
{x1, {x,suite}}
].
-% to get it running on development branch (without userconfig features)
-% function to print full config is in the ct_util, for me it's moved to ct_config
-% two following functions are only for the design period
-% after merging of userconfigs to the main branch ct_config:get_all_config/0
-% should be called instead
-is_exported(Module, Function, Arity)->
- Exports = Module:module_info(exports),
- case lists:keyfind(Function, 1, Exports) of
- false->
- false;
- {Function, Arity}->
- true;
- {Function, _OtherArity}->
- false
- end.
-
-get_all_config()->
- case is_exported(ct_util, get_all_config, 0) of
- true->
- {ct_util, ct_util:get_all_config()};
- false->
- {ct_config, ct_config:get_all_config()}
- end.
-
init_per_suite(Config) ->
- %{Module, Cfg} = get_all_config(),
- %ct:pal("CONFIG (handled by ~p):~n~p", [Module, Cfg]),
Config.
end_per_suite(_) ->
@@ -87,8 +61,6 @@ all() -> [test_get_config_simple, test_get_config_nested, test_default_suitewide
test_get_config_undefined].
init_per_testcase(_, Config) ->
- %{Module, Cfg} = get_all_config(),
- %ct:pal("CONFIG (handled by ~p):~n~p", [Module, Cfg]),
Config.
end_per_testcase(_, _) ->