diff options
| author | Lukas Larsson <[email protected]> | 2011-09-01 19:17:39 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-01 19:17:39 +0200 |
| commit | 8811898efa3862fbb32f5c7cd7eff3535084bea7 (patch) | |
| tree | f37f63cd31e9601f834bbfcb34b5e961669a38f7 /lib/test_server/src | |
| parent | eb4aa9b65c8b50597ed8fae092555145e466e1dc (diff) | |
| parent | 1e18245b72b1a22f90d78ee3f21fe2ea52bebdaf (diff) | |
| download | otp-8811898efa3862fbb32f5c7cd7eff3535084bea7.tar.gz otp-8811898efa3862fbb32f5c7cd7eff3535084bea7.tar.bz2 otp-8811898efa3862fbb32f5c7cd7eff3535084bea7.zip | |
Merge branch 'lukas/common_test/cth_prio/OTP-9445' into dev
* lukas/common_test/cth_prio/OTP-9445:
Fix a couple of minor bugs with hook priority
Update to reflect addition of CTH priority addition
Update CTH priority default to be 0
Update to reflect new cth callback api
Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} instead of NewState.
Add priority functionality and tests for ct hooks
Update internal hooks state to use a record instead of tuples
Diffstat (limited to 'lib/test_server/src')
| -rw-r--r-- | lib/test_server/src/ts_install_cth.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl index 0770190c36..a41916fd0a 100644 --- a/lib/test_server/src/ts_install_cth.erl +++ b/lib/test_server/src/ts_install_cth.erl @@ -65,18 +65,18 @@ id(_Opts) -> %% @doc Always called before any other callback function. -spec init(Id :: term(), Opts :: proplists:proplist()) -> - State :: #state{}. + {ok, State :: #state{}}. init(_Id, Opts) -> Nodenames = proplists:get_value(nodenames, Opts, 0), Nodes = proplists:get_value(nodes, Opts, 0), TSConfDir = proplists:get_value(ts_conf_dir, Opts), TargetSystem = proplists:get_value(target_system, Opts, install_local), InstallOpts = proplists:get_value(install_opts, Opts, []), - #state{ nodenames = Nodenames, - nodes = Nodes, - ts_conf_dir = TSConfDir, - target_system = TargetSystem, - install_opts = InstallOpts }. + {ok, #state{ nodenames = Nodenames, + nodes = Nodes, + ts_conf_dir = TSConfDir, + target_system = TargetSystem, + install_opts = InstallOpts } }. %% @doc Called before init_per_suite is called. -spec pre_init_per_suite(Suite :: atom(), |