pstn-free/baresip
1
0
Fork 0
mirror of https://github.com/baresip/baresip synced 2026-08-07 00:26:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: check fixture error and fix call progress (#3786)

Browse source
This commit is contained in:
Alfred E. Heggestad 2026-07-27 15:09:21 +02:00 • committed by GitHub
parent aac520681d
commit 2f4359bd8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
test/call.c
View file

@ -145,7 +145,8 @@ static int test_call_immediate_cancel(void)
/* run main-loop with timeout, wait for events */
err = re_main_timeout(5000);
TEST_ERR(err);
TEST_ERR(fix.err);
err = fix.err;
TEST_ERR(err);
ASSERT_EQ(0, fix.a.n_incoming);
ASSERT_EQ(0, fix.a.n_established);
@ -172,12 +173,10 @@ static int test_call_progress_cancel(void)
struct call *call;
int err = 0;
fixture_init(f);
f->behaviour = BEHAVIOUR_PROGRESS;
fixture_init_prm(f, ";answermode=early");
cancel_rule_new(BEVENT_CALL_PROGRESS, f->a.ua, 0, 0, 0);
cr->n_progress = 1;
f->behaviour = BEHAVIOUR_NOTHING;
/* Make a call from A to B */
err = ua_connect(f->a.ua, &call, NULL, f->buri, VIDMODE_OFF);
@ -186,13 +185,15 @@ static int test_call_progress_cancel(void)
/* run main-loop with timeout, wait for events */
err = re_main_timeout(5000);
TEST_ERR(err);
TEST_ERR(fix.err);
err = fix.err;
TEST_ERR(err);
ua_hangup(f->a.ua, call, 0, NULL);
err = re_main_timeout(5000);
TEST_ERR(err);
TEST_ERR(fix.err);
err = fix.err;
TEST_ERR(err);
ASSERT_EQ(0, fix.a.n_incoming);
ASSERT_EQ(1, fix.a.n_progress);
@ -220,12 +221,10 @@ static int test_call_answer_cancel(void)
struct call *call;
int err = 0;
fixture_init(f);
f->behaviour = BEHAVIOUR_PROGRESS;
fixture_init_prm(f, ";answermode=early");
cancel_rule_new(BEVENT_CALL_PROGRESS, f->a.ua, 0, 0, 0);
cr->n_progress = 1;
f->behaviour = BEHAVIOUR_NOTHING;
/* Make a call from A to B */
err = ua_connect(f->a.ua, &call, NULL, f->buri, VIDMODE_OFF);
@ -234,7 +233,8 @@ static int test_call_answer_cancel(void)
/* run main-loop with timeout, wait for events */
err = re_main_timeout(5000);
TEST_ERR(err);
TEST_ERR(fix.err);
err = fix.err;
TEST_ERR(err);
err = ua_answer(f->b.ua, NULL, VIDMODE_ON);
TEST_ERR(err);
@ -243,7 +243,8 @@ static int test_call_answer_cancel(void)
err = re_main_timeout(5000);
TEST_ERR(err);
TEST_ERR(fix.err);
err = fix.err;
TEST_ERR(err);
ASSERT_EQ(0, fix.a.n_incoming);
ASSERT_EQ(1, fix.a.n_progress);

1
test/call.h
View file

@ -17,7 +17,6 @@ enum behaviour {
BEHAVIOUR_REJECT,
BEHAVIOUR_REJECTF,
BEHAVIOUR_GET_HDRS,
BEHAVIOUR_PROGRESS,
};
enum action {

8
test/call_fixture.c
View file

@ -142,14 +142,6 @@ static void event_handler(enum bevent_ev ev, struct bevent *event, void *arg)
}
break;
case BEHAVIOUR_PROGRESS:
err = call_progress(call);
if (err) {
warning("call_progress failed (%m)\n", err);
goto out;
}
break;
default:
break;
}