diff options
| author | Micael Karlberg <[email protected]> | 2011-12-01 12:34:37 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-12-01 12:34:37 +0100 |
| commit | 4c96e3c0177fb9321808bffdf445f2c07a9fe36c (patch) | |
| tree | 4033e4b2f8b91b7d177098939b1cf5222344a5ce | |
| parent | d061c17e632a9f284f6336120b39b2fc4302dbcf (diff) | |
| parent | 7f97a16ec60f0bcc44db97b257dd96d40d32a3ef (diff) | |
| download | otp-4c96e3c0177fb9321808bffdf445f2c07a9fe36c.tar.gz otp-4c96e3c0177fb9321808bffdf445f2c07a9fe36c.tar.bz2 otp-4c96e3c0177fb9321808bffdf445f2c07a9fe36c.zip | |
Merge branch 'bmk/megaco/r15_proofing_test'
| -rw-r--r-- | lib/megaco/test/megaco_mess_test.erl | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl index 383e3df774..b4334149fc 100644 --- a/lib/megaco/test/megaco_mess_test.erl +++ b/lib/megaco/test/megaco_mess_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -456,9 +456,20 @@ connect(Config) when is_list(Config) -> ?VERIFY(bad_send_mod, megaco:user_info(MgMid, send_mod)), ?VERIFY(bad_send_mod, megaco:conn_info(PrelCH, send_mod)), SC = service_change_request(), - ?VERIFY({1, {error, {send_message_failed, {'EXIT', - {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}}}, - megaco:call(PrelCH, [SC], [])), + case megaco:call(PrelCH, [SC], []) of + {error, + {send_message_failed, + {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}} -> + ok; + + %% As of R15, we also get some extra info (line numbers, line numbers) + {error, + {send_message_failed, + {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _], _} | _]}}}} -> + ok; + Unexpected -> + ?ERROR(Unexpected) + end, ?VERIFY(ok, megaco:disconnect(PrelCH, shutdown)), |