diff options
author | Henrik Nord <[email protected]> | 2011-08-29 17:25:25 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-08-29 17:25:25 +0200 |
commit | 1a2fbf178614f752f04fd5c7499bb659293adf10 (patch) | |
tree | 32243efc57c967e31f3f2b239a70bb1e827cdd4b /lib/common_test/test | |
parent | b9ef73203a1b7f1400dc6d302827d7d732bab3f4 (diff) | |
parent | 7f5f7b08a8f0ed55126192beaed9d748f14c8f0a (diff) | |
download | otp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.gz otp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.bz2 otp-1a2fbf178614f752f04fd5c7499bb659293adf10.zip |
Merge branch 'dev' into major
Diffstat (limited to 'lib/common_test/test')
-rw-r--r-- | lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl index ebebfd18a9..71ed61b4c0 100644 --- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl +++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl @@ -59,8 +59,7 @@ -include_lib("common_test/src/ct_util.hrl").
-include_lib("common_test/include/ct_event.hrl").
--type proplist() :: list({atom(),term()}).
--type config() :: proplist().
+-type config() :: proplists:proplist(). -type reason() :: term().
-type skip_or_fail() :: {skip, reason()} |
{auto_skip, reason()} |
@@ -71,7 +70,7 @@ %% @doc Always called before any other callback function. Use this to initiate
%% any common state. It should return an state for this CTH.
--spec init(Id :: term(), Opts :: proplist()) ->
+-spec init(Id :: term(), Opts :: proplists:proplist()) -> State :: #state{}.
init(Id, Opts) ->
gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),
@@ -81,7 +80,7 @@ init(Id, Opts) -> %% @doc The ID is used to uniquly identify an CTH instance, if two CTH's
%% return the same ID the seconds CTH is ignored. This function should NOT
%% have any side effects as it might be called multiple times by common test.
--spec id(Opts :: proplist()) ->
+-spec id(Opts :: proplists:proplist()) -> Id :: term().
id(Opts) ->
gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),
|