diff options
author | Raimo Niskanen <[email protected]> | 2018-03-22 10:06:17 +0100 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2018-03-22 10:06:17 +0100 |
commit | 0c151c6939a83f9a26a45d24fd504fc4fb2f3f01 (patch) | |
tree | 0d3c171138d07cbd0eaccbd895dd8a37efb5002d /lib/stdlib/test/gen_statem_SUITE.erl | |
parent | a59429dcf6f69054e5e82783f7adf8a03c11fcc7 (diff) | |
parent | c5ee502e6031986983d3596745cad7fd547fd9c2 (diff) | |
download | otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.gz otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.bz2 otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
ssh: Fix bad spec for double_algs() in ssh.hrl
Test event insert from init
Fix init to allow all actions
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/stdlib/test/gen_statem_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/gen_statem_SUITE.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl index 7c8a386116..3f48fe1590 100644 --- a/lib/stdlib/test/gen_statem_SUITE.erl +++ b/lib/stdlib/test/gen_statem_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2016-2017. All Rights Reserved. +%% Copyright Ericsson AB 2016-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. @@ -832,9 +832,14 @@ event_types(_Config) -> %% Abusing the internal format of From... #{init => fun () -> - {ok, start, undefined} + {ok, start1, undefined, + [{next_event,internal,0}]} end, - start => + start1 => + fun (internal, 0, undefined) -> + {next_state, start2, undefined} + end, + start2 => fun ({call,_} = Call, Req, undefined) -> {next_state, state1, undefined, [{next_event,internal,1}, |