diff options
| author | Hans <[email protected]> | 2015-05-26 15:10:24 +0200 |
|---|---|---|
| committer | Hans <[email protected]> | 2015-05-26 15:10:24 +0200 |
| commit | 42dd87320c1197501b7f1ca864eb5515a2c9ba41 (patch) | |
| tree | 34b7ea8d1ced951e5b5f6fa0cd2fbe1c0841b853 /lib/ssh/test/ssh_connection_SUITE.erl | |
| parent | af51a9165b53cbbeae7428630299f82f0271dae0 (diff) | |
| parent | 946425be714a72b1dec0a67966679ef7a5c3e39d (diff) | |
| download | otp-42dd87320c1197501b7f1ca864eb5515a2c9ba41.tar.gz otp-42dd87320c1197501b7f1ca864eb5515a2c9ba41.tar.bz2 otp-42dd87320c1197501b7f1ca864eb5515a2c9ba41.zip | |
Merge branch 'hans/ssh/configurable_cipher/OTP-12029'
* hans/ssh/configurable_cipher/OTP-12029:
ssh: Algorithms test case added
ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'
ssh: New option 'preferred_algorithms'
ssh: Remove erroneous option 'role'
Diffstat (limited to 'lib/ssh/test/ssh_connection_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_connection_SUITE.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl index db51f65509..f0c337cf2f 100644 --- a/lib/ssh/test/ssh_connection_SUITE.erl +++ b/lib/ssh/test/ssh_connection_SUITE.erl @@ -65,6 +65,7 @@ ptty() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> + catch crypto:stop(), case catch crypto:start() of ok -> Config; |