diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-28 11:13:59 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-28 11:13:59 +0200 |
| commit | be8538809c571441e6543a677db58501634b7572 (patch) | |
| tree | 25b9229f4c16064d4831e357cb3dbde256331322 /erts/emulator/test/busy_port_SUITE.erl | |
| parent | 6bdf396b23219af136a217276308212913ca0aed (diff) | |
| parent | b83073436a39553da458b19ef572ded9cd051611 (diff) | |
| download | otp-be8538809c571441e6543a677db58501634b7572.tar.gz otp-be8538809c571441e6543a677db58501634b7572.tar.bz2 otp-be8538809c571441e6543a677db58501634b7572.zip | |
Merge branch 'dev' into major
* dev:
distribution_SUITE:bulk_send_bigbig/1: Fail with more information
distribution_SUITE: Use unique slave node names
beam_lib: Handle rare race in the crypto key server functionality
busy_port_SUITE: Avoid crash in register/2
[wx] Re-generate code
[wx] Remove optional shadowing clauses
[wx] Remove warning
[wx] Fix trailing whitespace
[wx] Test colors in textctrl
[wx] Fix cleanup memory references
Diffstat (limited to 'erts/emulator/test/busy_port_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/busy_port_SUITE.erl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl index 8365e1c540..dac2a70f59 100644 --- a/erts/emulator/test/busy_port_SUITE.erl +++ b/erts/emulator/test/busy_port_SUITE.erl @@ -20,7 +20,7 @@ -module(busy_port_SUITE). -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2, + init_per_group/2,end_per_group/2,end_per_testcase/2, io_to_busy/1, message_order/1, send_3/1, system_monitor/1, no_trap_exit/1, no_trap_exit_unlinked/1, trap_exit/1, multiple_writers/1, @@ -53,6 +53,20 @@ init_per_group(_GroupName, Config) -> end_per_group(_GroupName, Config) -> Config. +end_per_testcase(_Case, Config) when is_list(Config) -> + case whereis(busy_drv_server) of + undefined -> + ok; + Pid when is_pid(Pid) -> + Ref = monitor(process, Pid), + unlink(Pid), + exit(Pid, kill), + receive + {'DOWN',Ref,process,Pid,_} -> + ok + end + end, + Config. %% Tests I/O operations to a busy port, to make sure a suspended send %% operation is correctly restarted. This used to crash Beam. |