From 1212906351c3f4f5f759396c32b5e1dbabd403a4 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Thu, 5 Dec 2013 22:10:20 +0000 Subject: 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 --- tests/test_cdr.c | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'tests/test_cdr.c') diff --git a/tests/test_cdr.c b/tests/test_cdr.c index efbda86c4..57d5b2e32 100644 --- a/tests/test_cdr.c +++ b/tests/test_cdr.c @@ -272,11 +272,9 @@ static void clear_mock_cdr_backend(void) if ((priority) > 0) { \ ast_channel_priority_set((channel), (priority)); \ } \ - ast_channel_lock((channel)); \ ast_channel_appl_set((channel), (application)); \ ast_channel_data_set((channel), (data)); \ ast_channel_publish_snapshot((channel)); \ - ast_channel_unlock((channel)); \ } while (0) /*! \brief Hang up a test channel safely */ @@ -632,11 +630,9 @@ AST_TEST_DEFINE(test_cdr_single_party) SWAP_CONFIG(config, debug_cdr_config); CREATE_ALICE_CHANNEL(chan, &caller, &expected); - ast_channel_lock(chan); EMULATE_APP_DATA(chan, 1, "Answer", ""); ast_setstate(chan, AST_STATE_UP); EMULATE_APP_DATA(chan, 2, "VoiceMailMain", "1"); - ast_channel_unlock(chan); HANGUP_CHANNEL(chan, AST_CAUSE_NORMAL); @@ -683,11 +679,9 @@ AST_TEST_DEFINE(test_cdr_single_bridge) SWAP_CONFIG(config, debug_cdr_config); CREATE_ALICE_CHANNEL(chan, &caller, &expected); - ast_channel_lock(chan); EMULATE_APP_DATA(chan, 1, "Answer", ""); ast_setstate(chan, AST_STATE_UP); EMULATE_APP_DATA(chan, 2, "Bridge", ""); - ast_channel_unlock(chan); bridge = ast_bridge_basic_new(); ast_test_validate(test, bridge != NULL); @@ -760,11 +754,9 @@ AST_TEST_DEFINE(test_cdr_single_bridge_continue) CREATE_ALICE_CHANNEL(chan, &caller, &expected_one); COPY_IDS(chan, &expected_two); - ast_channel_lock(chan); EMULATE_APP_DATA(chan, 1, "Answer", ""); ast_setstate(chan, AST_STATE_UP); EMULATE_APP_DATA(chan, 2, "Bridge", ""); - ast_channel_unlock(chan); bridge_one = ast_bridge_basic_new(); ast_test_validate(test, bridge_one != NULL); @@ -846,11 +838,9 @@ AST_TEST_DEFINE(test_cdr_single_twoparty_bridge_a) CREATE_BOB_CHANNEL(chan_bob, &caller_bob, &bob_expected); ast_copy_string(bob_expected.linkedid, ast_channel_linkedid(chan_alice), sizeof(bob_expected.linkedid)); - ast_channel_lock(chan_alice); EMULATE_APP_DATA(chan_alice, 1, "Answer", ""); ast_setstate(chan_alice, AST_STATE_UP); EMULATE_APP_DATA(chan_alice, 2, "Bridge", ""); - ast_channel_unlock(chan_alice); bridge = ast_bridge_basic_new(); ast_test_validate(test, bridge != NULL); @@ -858,11 +848,9 @@ AST_TEST_DEFINE(test_cdr_single_twoparty_bridge_a) ast_test_validate(test, !ast_bridge_impart(bridge, chan_alice, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); - ast_channel_lock(chan_bob); EMULATE_APP_DATA(chan_bob, 1, "Answer", ""); ast_setstate(chan_bob, AST_STATE_UP); EMULATE_APP_DATA(chan_bob, 2, "Bridge", ""); - ast_channel_unlock(chan_bob); ast_test_validate(test, !ast_bridge_impart(bridge, chan_bob, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); @@ -938,20 +926,16 @@ AST_TEST_DEFINE(test_cdr_single_twoparty_bridge_b) CREATE_BOB_CHANNEL(chan_bob, &caller_bob, &bob_expected); ast_copy_string(bob_expected.linkedid, ast_channel_linkedid(chan_alice), sizeof(bob_expected.linkedid)); - ast_channel_unlock(chan_alice); EMULATE_APP_DATA(chan_alice, 1, "Answer", ""); ast_setstate(chan_alice, AST_STATE_UP); EMULATE_APP_DATA(chan_alice, 2, "Bridge", ""); - ast_channel_unlock(chan_alice); bridge = ast_bridge_basic_new(); ast_test_validate(test, bridge != NULL); - ast_channel_lock(chan_bob); EMULATE_APP_DATA(chan_bob, 1, "Answer", ""); ast_setstate(chan_bob, AST_STATE_UP); EMULATE_APP_DATA(chan_bob, 2, "Bridge", ""); - ast_channel_unlock(chan_bob); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); ast_test_validate(test, !ast_bridge_impart(bridge, chan_bob, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); @@ -1065,11 +1049,9 @@ AST_TEST_DEFINE(test_cdr_single_multiparty_bridge) CREATE_CHARLIE_CHANNEL(chan_charlie, &caller_charlie, &charlie_expected); ast_copy_string(charlie_expected.linkedid, ast_channel_linkedid(chan_alice), sizeof(charlie_expected.linkedid)); - ast_channel_lock(chan_alice); EMULATE_APP_DATA(chan_alice, 1, "Answer", ""); ast_setstate(chan_alice, AST_STATE_UP); EMULATE_APP_DATA(chan_alice, 2, "Bridge", ""); - ast_channel_unlock(chan_alice); bridge = ast_bridge_basic_new(); ast_test_validate(test, bridge != NULL); @@ -1077,22 +1059,18 @@ AST_TEST_DEFINE(test_cdr_single_multiparty_bridge) ast_test_validate(test, !ast_bridge_impart(bridge, chan_alice, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); - ast_channel_lock(chan_bob); EMULATE_APP_DATA(chan_bob, 1, "Answer", ""); ast_setstate(chan_bob, AST_STATE_UP); EMULATE_APP_DATA(chan_bob, 2, "Bridge", ""); - ast_channel_unlock(chan_bob); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); ast_test_validate(test, !ast_bridge_impart(bridge, chan_bob, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); - ast_channel_lock(chan_charlie); EMULATE_APP_DATA(chan_charlie, 1, "Answer", ""); ast_setstate(chan_charlie, AST_STATE_UP); EMULATE_APP_DATA(chan_charlie, 2, "Bridge", ""); - ast_channel_unlock(chan_charlie); ast_test_validate(test, !ast_bridge_impart(bridge, chan_charlie, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); @@ -2022,15 +2000,10 @@ AST_TEST_DEFINE(test_cdr_park) CREATE_ALICE_CHANNEL(chan_alice, &alice_caller, &alice_expected); CREATE_BOB_CHANNEL(chan_bob, &bob_caller, &bob_expected); - ast_channel_lock(chan_alice); EMULATE_APP_DATA(chan_alice, 1, "Park", "700"); ast_setstate(chan_alice, AST_STATE_UP); - ast_channel_unlock(chan_alice); - - ast_channel_lock(chan_bob); EMULATE_APP_DATA(chan_bob, 1, "Park", "701"); ast_setstate(chan_bob, AST_STATE_UP); - ast_channel_unlock(chan_bob); bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM @@ -2135,7 +2108,6 @@ AST_TEST_DEFINE(test_cdr_fields) ast_copy_string(fork_expected_two.linkedid, ast_channel_linkedid(chan), sizeof(fork_expected_two.linkedid)); /* Channel enters Wait app */ - ast_channel_lock(chan); ast_channel_appl_set(chan, "Wait"); ast_channel_data_set(chan, "10"); ast_channel_priority_set(chan, 1); @@ -2144,7 +2116,6 @@ AST_TEST_DEFINE(test_cdr_fields) /* Set properties on the channel that propagate to the CDR */ ast_channel_amaflags_set(chan, AST_AMA_OMIT); ast_channel_accountcode_set(chan, "XXX"); - ast_channel_unlock(chan); /* Wait one second so we get a duration. */ while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); @@ -2237,7 +2208,6 @@ AST_TEST_DEFINE(test_cdr_fields) ast_test_validate(test, ast_cdr_fork(ast_channel_name(chan), &fork_options) == 0); /* Channel enters Answer app */ - ast_channel_lock(chan); ast_channel_appl_set(chan, "Answer"); ast_channel_data_set(chan, ""); ast_channel_priority_set(chan, 1); @@ -2246,7 +2216,6 @@ AST_TEST_DEFINE(test_cdr_fields) /* Set properties on the last record */ ast_channel_accountcode_set(chan, "ZZZ"); - ast_channel_unlock(chan); ast_cdr_setuserfield(ast_channel_name(chan), "schmackity"); ast_test_validate(test, ast_cdr_setvar(ast_channel_name(chan), "test_variable", "record_2") == 0); @@ -2416,9 +2385,7 @@ AST_TEST_DEFINE(test_cdr_fork_cdr) ast_test_validate(test, ast_cdr_fork(ast_channel_name(chan), &fork_options) == 0); /* Test keep variables; setting a new answer time */ - ast_channel_lock(chan); ast_setstate(chan, AST_STATE_UP); - ast_channel_unlock(chan); while ((nanosleep(&to_sleep, &to_sleep) == -1) && (errno == EINTR)); ast_test_validate(test, ast_cdr_setvar(ast_channel_name(chan), "test_variable", "record_2") == 0); ast_test_validate(test, ast_cdr_getvar(ast_channel_name(chan), "test_variable", varbuffer, sizeof(varbuffer)) == 0); -- cgit v1.2.3