diff options
author | Siri Hansen <[email protected]> | 2016-06-09 14:52:35 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2016-06-09 14:52:35 +0200 |
commit | 68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8 (patch) | |
tree | b34c9396a56b03968beaf3cdbab56e4a8a4847d2 /lib/common_test/test/ct_test_support.erl | |
parent | 75e5cdabbcaaa12f043225ca8d361055a9d47b24 (diff) | |
parent | baf5751951f3463d599ccb958272ab6a6fec39b4 (diff) | |
download | otp-68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8.tar.gz otp-68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8.tar.bz2 otp-68ff9f3e4b5387cf38af7aeb1a8b7abbdaa867d8.zip |
Merge branch 'siri/cuddle-master'
* siri/cuddle-master:
[ct test] Wait for event receiver to be unregistered
[ct test] Flush messages from old client after close in telnet server
[ct test] Use monitor instead of ct:sleep
[ct test] Check that crypto is loaded, or skip netconf tests
[ct test] Reduce amount of data in netconfc1_SUITE:get_a_lot
Diffstat (limited to 'lib/common_test/test/ct_test_support.erl')
-rw-r--r-- | lib/common_test/test/ct_test_support.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 477fcb8a26..e926abd885 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -484,7 +484,8 @@ get_events(_, Config) -> {event_receiver,CTNode} ! {self(),get_events}, Events = receive {event_receiver,Evs} -> Evs end, test_server:format(Level, "Stopping event receiver!~n", []), - {event_receiver,CTNode} ! stop, + {event_receiver,CTNode} ! {self(),stop}, + receive {event_receiver,stopped} -> ok end, Events. er() -> @@ -499,8 +500,9 @@ er_loop(Evs) -> {From,get_events} -> From ! {event_receiver,lists:reverse(Evs)}, er_loop(Evs); - stop -> + {From,stop} -> unregister(event_receiver), + From ! {event_receiver,stopped}, ok end. |