diff options
| author | Hans Bolinder <[email protected]> | 2018-01-23 11:34:18 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-01-23 11:34:18 +0100 |
| commit | dc6a03a8351819a91c1e9235dd84df0acd4ba6b8 (patch) | |
| tree | 0dfd2c3c3cbf86656929d5a0e140f7825fc8d1dd /lib/stdlib/test/gen_fsm_SUITE.erl | |
| parent | 7a37e39d45597a25ff532751c5131938b5286331 (diff) | |
| parent | 6deabadcda913b4fd7f3d209e4344f0b0f736e85 (diff) | |
| download | otp-dc6a03a8351819a91c1e9235dd84df0acd4ba6b8.tar.gz otp-dc6a03a8351819a91c1e9235dd84df0acd4ba6b8.tar.bz2 otp-dc6a03a8351819a91c1e9235dd84df0acd4ba6b8.zip | |
Merge branch 'hasse/kernel-stdlib/fix_contracts/OTP-14889' into maint
* hasse/kernel-stdlib/fix_contracts/OTP-14889:
kernel: Correct contracts and a bug in group_history
stdlib: Correct contracts
dialyzer: Optimize handling of a lot of warnings
Diffstat (limited to 'lib/stdlib/test/gen_fsm_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/gen_fsm_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl index 86cf58566b..41ee3246f5 100644 --- a/lib/stdlib/test/gen_fsm_SUITE.erl +++ b/lib/stdlib/test/gen_fsm_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2017. All Rights Reserved. +%% Copyright Ericsson AB 1996-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -389,7 +389,7 @@ stop10(_Config) -> Dir = filename:dirname(code:which(?MODULE)), rpc:call(Node,code,add_path,[Dir]), {ok, Pid} = rpc:call(Node,gen_fsm,start,[{global,to_stop},?MODULE,[],[]]), - global:sync(), + ok = global:sync(), ok = gen_fsm:stop({global,to_stop}), false = rpc:call(Node,erlang,is_process_alive,[Pid]), {'EXIT',noproc} = (catch gen_fsm:stop({global,to_stop})), @@ -1005,7 +1005,7 @@ undef_in_terminate(Config) when is_list(Config) -> State = {undef_in_terminate, {?MODULE, terminate}}, {ok, FSM} = gen_fsm:start(?MODULE, {state_data, State}, []), try - gen_fsm:stop(FSM), + ok = gen_fsm:stop(FSM), ct:fail(failed) catch exit:{undef, [{?MODULE, terminate, _, _}|_]} -> @@ -1201,7 +1201,7 @@ timeout({timeout,Ref,{timeout,Time}}, {From,Ref}) -> Cref = gen_fsm:start_timer(Time, cancel), Time4 = Time*4, receive after Time4 -> ok end, - gen_fsm:cancel_timer(Cref), + _= gen_fsm:cancel_timer(Cref), {next_state, timeout, {From,Ref2}}; timeout({timeout,Ref2,ok},{From,Ref2}) -> gen_fsm:reply(From, ok), |