diff options
author | Henrik Nord <[email protected]> | 2011-08-29 17:15:23 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-08-29 17:21:47 +0200 |
commit | 7f5f7b08a8f0ed55126192beaed9d748f14c8f0a (patch) | |
tree | a35f7ab30a0e1a18664c1fd0e3adea281d152396 /lib/common_test/src | |
parent | f94beb7788106a85a02bebcd6362a170248fa659 (diff) | |
parent | 7d8a1f8b944d6734d9419f184c441899a48c11a3 (diff) | |
download | otp-7f5f7b08a8f0ed55126192beaed9d748f14c8f0a.tar.gz otp-7f5f7b08a8f0ed55126192beaed9d748f14c8f0a.tar.bz2 otp-7f5f7b08a8f0ed55126192beaed9d748f14c8f0a.zip |
Merge branch 'rz/add_proplist_type' into dev
* rz/add_proplist_type:
Add a proplist() type
OTP-9499
Diffstat (limited to 'lib/common_test/src')
-rw-r--r-- | lib/common_test/src/ct_hooks.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl index 984e04b90f..ece592e320 100644 --- a/lib/common_test/src/ct_hooks.erl +++ b/lib/common_test/src/ct_hooks.erl @@ -31,8 +31,6 @@ -export([on_tc_skip/2]). -export([on_tc_fail/2]). --type proplist() :: [{atom(),term()}]. - %% If you change this, remember to update ct_util:look -> stop clause as well. -define(config_name, ct_hooks). @@ -59,7 +57,7 @@ terminate(Hooks) -> %% @doc Called as each test case is started. This includes all configuration %% tests. -spec init_tc(Mod :: atom(), Func :: atom(), Args :: list()) -> - NewConfig :: proplist() | + NewConfig :: proplists:proplist() | {skip, Reason :: term()} | {auto_skip, Reason :: term()} | {fail, Reason :: term()}. @@ -92,7 +90,7 @@ init_tc(_Mod, TC, Config) -> Args :: list(), Result :: term(), Resturn :: term()) -> - NewConfig :: proplist() | + NewConfig :: proplists:proplist() | {skip, Reason :: term()} | {auto_skip, Reason :: term()} | {fail, Reason :: term()} | |