diff options
| author | Siri Hansen <[email protected]> | 2012-08-24 17:22:29 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-08-24 17:22:29 +0200 |
| commit | 8830e82923e15981fb73d9974cd4bfb04d772b16 (patch) | |
| tree | c9d1e2df64340e3f0cf5ad664e90c9364f900d06 | |
| parent | 9997bcfb630d860b9eeae29a08d953dc9afea01f (diff) | |
| parent | a03b01444641aedfe6f6730d38ff890e33d3a8ea (diff) | |
| download | otp-8830e82923e15981fb73d9974cd4bfb04d772b16.tar.gz otp-8830e82923e15981fb73d9974cd4bfb04d772b16.tar.bz2 otp-8830e82923e15981fb73d9974cd4bfb04d772b16.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/common_test/src/ct_netconfc.erl | 14 | ||||
| -rw-r--r-- | lib/common_test/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/test_server/vsn.mk | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl index d9c4a962dc..5f8bae89fa 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -1074,12 +1074,18 @@ handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) -> handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) -> handle_data(Data, State); -handle_msg({ssh_cm, _CM, {closed,_Ch}}, State) -> - %% This will happen if the server terminates the connection, as in - %% kill-session (or if ssh:close is called from somewhere +handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) -> + %% _SshCloseMsg can probably be one of + %% {eof,Ch} + %% {exit_status,Ch,Status} + %% {exit_signal,Ch,ExitSignal,ErrorMsg,LanguageString} + %% {signal,Ch,Signal} + + %% This might e.g. happen if the server terminates the connection, + %% as in kill-session (or if ssh:close is called from somewhere %% unexpected). - %%! Log this?? - i.e. as server closing the connection + %%! Log this?? %%! Currently the log will say that the client closed the %%! connection - due to terminate/2 diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index b94f7f7593..877aa775fd 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.6.1 +COMMON_TEST_VSN = 1.6.2 diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk index a1f4559083..aecf595f3f 100644 --- a/lib/test_server/vsn.mk +++ b/lib/test_server/vsn.mk @@ -1 +1 @@ -TEST_SERVER_VSN = 3.5.1 +TEST_SERVER_VSN = 3.5.2 |