aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-29 17:25:25 +0200
committerHenrik Nord <[email protected]>2011-08-29 17:25:25 +0200
commit1a2fbf178614f752f04fd5c7499bb659293adf10 (patch)
tree32243efc57c967e31f3f2b239a70bb1e827cdd4b /lib/common_test/src
parentb9ef73203a1b7f1400dc6d302827d7d732bab3f4 (diff)
parent7f5f7b08a8f0ed55126192beaed9d748f14c8f0a (diff)
downloadotp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.gz
otp-1a2fbf178614f752f04fd5c7499bb659293adf10.tar.bz2
otp-1a2fbf178614f752f04fd5c7499bb659293adf10.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/common_test/src')
-rw-r--r--lib/common_test/src/ct_hooks.erl6
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 ef7630e051..ebe2d5787d 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()} |