diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /tests/test_stasis_channels.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_stasis_channels.c')
| -rw-r--r-- | tests/test_stasis_channels.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c index b7c9fe2c5..45f1e2ba3 100644 --- a/tests/test_stasis_channels.c +++ b/tests/test_stasis_channels.c @@ -77,12 +77,10 @@ AST_TEST_DEFINE(channel_blob_create) "foo", "bar"); /* Off nominal creation */ - ast_channel_lock(chan); ast_test_validate(test, NULL == ast_channel_blob_create(chan, NULL, json)); /* Test for single channel */ msg = ast_channel_blob_create(chan, type, json); - ast_channel_unlock(chan); ast_test_validate(test, NULL != msg); blob = stasis_message_data(msg); ast_test_validate(test, NULL != blob); @@ -131,9 +129,7 @@ AST_TEST_DEFINE(null_blob) "foo", "bar"); /* Test for single channel */ - ast_channel_lock(chan); msg = ast_channel_blob_create(chan, type, NULL); - ast_channel_unlock(chan); ast_test_validate(test, NULL != msg); blob = stasis_message_data(msg); ast_test_validate(test, NULL != blob); @@ -200,15 +196,9 @@ AST_TEST_DEFINE(multi_channel_blob_snapshots) chan_charlie = ast_channel_alloc(0, AST_STATE_DOWN, "300", "Bob", "300", "300", "default", NULL, 0, "TEST/Charlie"); blob = ast_multi_channel_blob_create(json); - ast_channel_lock(chan_alice); ast_multi_channel_blob_add_channel(blob, "Caller", ast_channel_snapshot_create(chan_alice)); - ast_channel_unlock(chan_alice); - ast_channel_lock(chan_bob); ast_multi_channel_blob_add_channel(blob, "Peer", ast_channel_snapshot_create(chan_bob)); - ast_channel_unlock(chan_bob); - ast_channel_lock(chan_charlie); ast_multi_channel_blob_add_channel(blob, "Peer", ast_channel_snapshot_create(chan_charlie)); - ast_channel_unlock(chan_charlie); /* Test for unknown role */ ast_test_validate(test, NULL == ast_multi_channel_blob_get_channel(blob, "Foobar")); @@ -262,9 +252,7 @@ AST_TEST_DEFINE(channel_snapshot_json) chan = ast_channel_alloc(0, AST_STATE_DOWN, "cid_num", "cid_name", "acctcode", "exten", "context", NULL, 0, "TEST/name"); ast_test_validate(test, NULL != chan); - ast_channel_lock(chan); snapshot = ast_channel_snapshot_create(chan); - ast_channel_unlock(chan); ast_test_validate(test, NULL != snapshot); actual = ast_channel_snapshot_to_json(snapshot, NULL); |