From 6d57908ce2b82c9928de22513a38c9e441ae448b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 29 Aug 2014 19:47:42 +0200 Subject: [PATCH] move flexisip conf files into a dedicated directory. Add README simple_call is checking CallReleased state. --- mediastreamer2 | 2 +- oRTP | 2 +- tester/README | 9 +++++++++ tester/call_tester.c | 2 ++ tester/{ => flexisip}/flexisip.conf | 4 ++-- tester/{ => flexisip}/userdb.conf | 0 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 tester/README rename tester/{ => flexisip}/flexisip.conf (99%) rename tester/{ => flexisip}/userdb.conf (100%) diff --git a/mediastreamer2 b/mediastreamer2 index 7a0842cbf..72e45852e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 7a0842cbfc9afe794feff095a2a864a57e9c1e81 +Subproject commit 72e45852e9f52c4acdabed4810d94db44eb8fa61 diff --git a/oRTP b/oRTP index b2a7137bb..7ad100e9f 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit b2a7137bbdaf6be4c6462058d01c6023b22d7302 +Subproject commit 7ad100e9f3b28e6a37f5472f70c49500ec15f49e diff --git a/tester/README b/tester/README new file mode 100644 index 000000000..dfc060ecc --- /dev/null +++ b/tester/README @@ -0,0 +1,9 @@ +This is the test suite of liblinphone, with many tests suites for Register, Calls, Message, Presence. + +All thoses tests suites require a SIP server configured accordingly in order to execute. Naturally a Flexisip SIP server is used, whose configuration is put in the flexisip/ directory here. + +In order to invoke it, just place into the tester directory and run +$ flexisip --configfile flexisip/flexisip.conf + +The tester_hosts file contains the host-like DNS configuration file to be used by the test suite in order to resolve the virtual SIP domains used by the SIP stack. +It is possible to run the flexisip SIP server and the test suite on the same machine by passing a new tester_hosts file where domains resolve to 127.0.0.1 to the tester, using the --dns-hosts option. diff --git a/tester/call_tester.c b/tester/call_tester.c index 1366814a5..433d42d3c 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -270,6 +270,8 @@ static void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2){ linphone_core_terminate_all_calls(m1->lc); CU_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m1->stat.number_of_LinphoneCallEnd,1)); CU_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallEnd,1)); + CU_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m1->stat.number_of_LinphoneCallReleased,1)); + CU_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallReleased,1)); } static void simple_call(void) { diff --git a/tester/flexisip.conf b/tester/flexisip/flexisip.conf similarity index 99% rename from tester/flexisip.conf rename to tester/flexisip/flexisip.conf index 303a1022f..844ea7905 100755 --- a/tester/flexisip.conf +++ b/tester/flexisip/flexisip.conf @@ -41,7 +41,7 @@ transports=sip:*:5060 sips:*:5061;tls-certificates-dir=/etc/flexisip/tls/certif # An absolute path of a directory where TLS server certificate and # private key can be found, concatenated inside an 'agent.pem' file. # Default value: /etc/flexisip/tls -tls-certificates-dir=/etc/flexisip/tls/certificates/cn +tls-certificates-dir=./certificates/cn #tls-certificates-dir=/media/sf_workspaces/workspace-macosx/flexisip ## @@ -151,7 +151,7 @@ db-implementation=file # for a DSN-less connection. ex3: /etc/flexisip/passwd; for a file # containing one 'user@domain password' by line. # Default value: -datasource=/etc/flexisip/userdb.conf +datasource=./flexisip/userdb.conf # Odbc SQL request to execute to obtain the password # . Named parameters are :id (the user found in the from header), diff --git a/tester/userdb.conf b/tester/flexisip/userdb.conf similarity index 100% rename from tester/userdb.conf rename to tester/flexisip/userdb.conf