test_stasis_endpoints: Remove expected channel snapshot

We no longer publish a channel snapshot when it is associated with an endpoint;
after all, the channel itself hasn't changed - the endpoint state has changed.
This updates the channel_messages unit test accordingly.
........

Merged revisions 416298 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-06-15 21:42:45 +00:00
parent b52c6d0903
commit 705d0c3e81

View File

@@ -239,16 +239,12 @@ AST_TEST_DEFINE(channel_messages)
ast_endpoint_add_channel(uut, chan); ast_endpoint_add_channel(uut, chan);
actual_count = stasis_message_sink_wait_for_count(sink, 2, actual_count = stasis_message_sink_wait_for_count(sink, 1,
STASIS_SINK_DEFAULT_WAIT); STASIS_SINK_DEFAULT_WAIT);
ast_test_validate(test, 2 == actual_count); ast_test_validate(test, 1 == actual_count);
msg = sink->messages[0]; msg = sink->messages[0];
type = stasis_message_type(msg); type = stasis_message_type(msg);
ast_test_validate(test, ast_channel_snapshot_type() == type);
msg = sink->messages[1];
type = stasis_message_type(msg);
ast_test_validate(test, ast_endpoint_snapshot_type() == type); ast_test_validate(test, ast_endpoint_snapshot_type() == type);
actual_snapshot = stasis_message_data(msg); actual_snapshot = stasis_message_data(msg);
ast_test_validate(test, 1 == actual_snapshot->num_channels); ast_test_validate(test, 1 == actual_snapshot->num_channels);
@@ -256,20 +252,20 @@ AST_TEST_DEFINE(channel_messages)
ast_hangup(chan); ast_hangup(chan);
chan = NULL; chan = NULL;
actual_count = stasis_message_sink_wait_for_count(sink, 5, actual_count = stasis_message_sink_wait_for_count(sink, 4,
STASIS_SINK_DEFAULT_WAIT); STASIS_SINK_DEFAULT_WAIT);
ast_test_validate(test, 5 == actual_count); ast_test_validate(test, 4 == actual_count);
msg = sink->messages[2]; msg = sink->messages[1];
type = stasis_message_type(msg); type = stasis_message_type(msg);
ast_test_validate(test, ast_channel_snapshot_type() == type); ast_test_validate(test, ast_channel_snapshot_type() == type);
/* The ordering of the cache clear and endpoint snapshot are /* The ordering of the cache clear and endpoint snapshot are
* unspecified */ * unspecified */
msg = sink->messages[3]; msg = sink->messages[2];
if (stasis_message_type(msg) == stasis_cache_clear_type()) { if (stasis_message_type(msg) == stasis_cache_clear_type()) {
/* Okay; the next message should be the endpoint snapshot */ /* Okay; the next message should be the endpoint snapshot */
msg = sink->messages[4]; msg = sink->messages[3];
} }
type = stasis_message_type(msg); type = stasis_message_type(msg);