diff options
| author | Siri Hansen <[email protected]> | 2016-07-11 11:49:57 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-07-11 11:49:57 +0200 |
| commit | 761e4679cd3963f09e6d1623734aa2c6e28d788a (patch) | |
| tree | f966f3279ee67815b70f8f73fa16e20240152ca9 /lib/sasl/test/rh_test_lib.erl | |
| parent | a5256e5221aff30f6d2cc7fab4875914ae734217 (diff) | |
| parent | ebea63ee20e61464a471f88e670fe66e60830691 (diff) | |
| download | otp-761e4679cd3963f09e6d1623734aa2c6e28d788a.tar.gz otp-761e4679cd3963f09e6d1623734aa2c6e28d788a.tar.bz2 otp-761e4679cd3963f09e6d1623734aa2c6e28d788a.zip | |
Merge branch 'siri/cuddle-maint' into maint
* siri/cuddle-maint:
[sasl test] Skip tests on slow host
[sasl test] Catch erlang:port_close/1
[ct test] Extent node startup timeouts in netconfc_remote_SUITE
[ct test] Monitor netconf server during transaction
[sasl test] Extend wait time when starting nodes
[ct test] Skip system time related tests on TimeWarpingOS
Diffstat (limited to 'lib/sasl/test/rh_test_lib.erl')
| -rw-r--r-- | lib/sasl/test/rh_test_lib.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/test/rh_test_lib.erl b/lib/sasl/test/rh_test_lib.erl index 11935496d8..dacd8b6b9f 100644 --- a/lib/sasl/test/rh_test_lib.erl +++ b/lib/sasl/test/rh_test_lib.erl @@ -18,7 +18,7 @@ cmd(Cmd,Args,Env) -> case open_port({spawn_executable, Cmd}, [{args,Args},{env,Env}]) of Port when is_port(Port) -> unlink(Port), - erlang:port_close(Port), + catch erlang:port_close(Port), % migth already be closed, so catching ok; Error -> Error |