diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-04-13 12:14:02 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-04-13 12:14:02 +0000 |
commit | 1823322ac0a440303c65f21de535724f213f480d (patch) | |
tree | 6f39caba554406e2d8d29a259097b42d3c5ecfc1 /tests | |
parent | d73d8cef462aa2e6f4476b53175bcb55b130b021 (diff) |
Re #1842: Updated pjsua app to avoid stdout buffering, and also adjusted python tests accordingly.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5065 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'tests')
-rw-r--r-- | tests/pjsua/mod_call.py | 28 | ||||
-rw-r--r-- | tests/pjsua/scripts-call/300_ice_1_1.py | 4 | ||||
-rw-r--r-- | tests/pjsua/scripts-call/305_ice_comp_1_2.py | 4 | ||||
-rw-r--r-- | tests/pjsua/scripts-call/305_ice_comp_2_1.py | 4 | ||||
-rw-r--r-- | tests/pjsua/scripts-sendto/200_ice_success_2.py | 3 | ||||
-rw-r--r-- | tests/pjsua/scripts-sendto/200_ice_success_3.py | 3 | ||||
-rw-r--r-- | tests/pjsua/scripts-sendto/200_ice_success_4.py | 3 |
7 files changed, 23 insertions, 26 deletions
diff --git a/tests/pjsua/mod_call.py b/tests/pjsua/mod_call.py index 7081aed4..950a70da 100644 --- a/tests/pjsua/mod_call.py +++ b/tests/pjsua/mod_call.py @@ -53,19 +53,19 @@ def test_func(t): callee.send("200") # Wait until call is connected in both endpoints - time.sleep(0.2) + ##time.sleep(0.2) caller.expect(const.STATE_CONFIRMED) callee.expect(const.STATE_CONFIRMED) # Synchronize stdout caller.sync_stdout() callee.sync_stdout() - time.sleep(0.1) + ##time.sleep(0.1) caller.sync_stdout() callee.sync_stdout() # Test that media is okay - time.sleep(0.3) + ##time.sleep(0.3) check_media(caller, callee) check_media(callee, caller) @@ -73,20 +73,20 @@ def test_func(t): caller.send("H") caller.expect("INVITE sip:") callee.expect("INVITE sip:") - caller.expect(const.MEDIA_HOLD) callee.expect(const.MEDIA_HOLD) + caller.expect(const.MEDIA_HOLD) # Synchronize stdout caller.sync_stdout() callee.sync_stdout() # Release hold - time.sleep(0.5) + ##time.sleep(0.5) caller.send("v") caller.expect("INVITE sip:") callee.expect("INVITE sip:") - caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold") callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold") + caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold") # Synchronize stdout caller.sync_stdout() @@ -112,12 +112,12 @@ def test_func(t): callee.sync_stdout() # Release hold - time.sleep(0.1) + ##time.sleep(0.1) callee.send("v") callee.expect("INVITE sip:") caller.expect("INVITE sip:") - callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold") caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold") + callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold") # Synchronize stdout caller.sync_stdout() @@ -125,7 +125,7 @@ def test_func(t): # Test that media is okay # Wait for some time for ICE negotiation - time.sleep(0.6) + ##time.sleep(0.6) check_media(caller, callee) check_media(callee, caller) @@ -144,7 +144,7 @@ def test_func(t): callee.sync_stdout() # Test that media is okay - time.sleep(0.1) + ##time.sleep(0.1) check_media(caller, callee) check_media(callee, caller) @@ -160,7 +160,7 @@ def test_func(t): callee.sync_stdout() # Test that media is okay - time.sleep(0.1) + ##time.sleep(0.1) check_media(caller, callee) check_media(callee, caller) @@ -193,7 +193,7 @@ def test_func(t): caller.sync_stdout() # Test that media is still okay - time.sleep(0.1) + ##time.sleep(0.1) check_media(caller, callee) check_media(callee, caller) @@ -207,12 +207,12 @@ def test_func(t): callee.sync_stdout() # Test that media is still okay - time.sleep(0.1) + ##time.sleep(0.1) check_media(callee, caller) check_media(caller, callee) # Hangup call - time.sleep(0.1) + ##time.sleep(0.1) caller.send("h") # Wait until calls are cleared in both endpoints diff --git a/tests/pjsua/scripts-call/300_ice_1_1.py b/tests/pjsua/scripts-call/300_ice_1_1.py index 456aa46b..0bf8cc15 100644 --- a/tests/pjsua/scripts-call/300_ice_1_1.py +++ b/tests/pjsua/scripts-call/300_ice_1_1.py @@ -6,7 +6,7 @@ from inc_cfg import * test_param = TestParam( "Callee=use ICE, caller=use ICE", [ - InstanceParam("callee", "--null-audio --use-ice --max-calls=1", enable_buffer=True), - InstanceParam("caller", "--null-audio --use-ice --max-calls=1", enable_buffer=True) + InstanceParam("callee", "--null-audio --use-ice --max-calls=1"), + InstanceParam("caller", "--null-audio --use-ice --max-calls=1") ] ) diff --git a/tests/pjsua/scripts-call/305_ice_comp_1_2.py b/tests/pjsua/scripts-call/305_ice_comp_1_2.py index 7580b204..5efeb0ce 100644 --- a/tests/pjsua/scripts-call/305_ice_comp_1_2.py +++ b/tests/pjsua/scripts-call/305_ice_comp_1_2.py @@ -6,7 +6,7 @@ from inc_cfg import * test_param = TestParam( "Callee=use ICE, caller=use ICE", [ - InstanceParam("callee", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp", enable_buffer=True), - InstanceParam("caller", "--null-audio --use-ice --max-calls=1", enable_buffer=True) + InstanceParam("callee", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp"), + InstanceParam("caller", "--null-audio --use-ice --max-calls=1") ] ) diff --git a/tests/pjsua/scripts-call/305_ice_comp_2_1.py b/tests/pjsua/scripts-call/305_ice_comp_2_1.py index a0ddaf78..304079e3 100644 --- a/tests/pjsua/scripts-call/305_ice_comp_2_1.py +++ b/tests/pjsua/scripts-call/305_ice_comp_2_1.py @@ -6,7 +6,7 @@ from inc_cfg import * test_param = TestParam( "Callee=use ICE, caller=use ICE", [ - InstanceParam("callee", "--null-audio --use-ice --max-calls=1", enable_buffer=True), - InstanceParam("caller", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp", enable_buffer=True) + InstanceParam("callee", "--null-audio --use-ice --max-calls=1"), + InstanceParam("caller", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp") ] ) diff --git a/tests/pjsua/scripts-sendto/200_ice_success_2.py b/tests/pjsua/scripts-sendto/200_ice_success_2.py index caf64b91..324fca0e 100644 --- a/tests/pjsua/scripts-sendto/200_ice_success_2.py +++ b/tests/pjsua/scripts-sendto/200_ice_success_2.py @@ -31,6 +31,5 @@ exclude = [ sendto_cfg = sip.SendtoCfg( "caller sends only one component", pjsua_args=args, sdp=sdp, resp_code=200, - resp_inc=include, resp_exc=exclude, - enable_buffer = True) + resp_inc=include, resp_exc=exclude) diff --git a/tests/pjsua/scripts-sendto/200_ice_success_3.py b/tests/pjsua/scripts-sendto/200_ice_success_3.py index 2c741e44..307e6afe 100644 --- a/tests/pjsua/scripts-sendto/200_ice_success_3.py +++ b/tests/pjsua/scripts-sendto/200_ice_success_3.py @@ -30,6 +30,5 @@ exclude = [ sendto_cfg = sip.SendtoCfg( "caller sends two components without a=rtcp line", pjsua_args=args, sdp=sdp, resp_code=200, - resp_inc=include, resp_exc=exclude, - enable_buffer = True) + resp_inc=include, resp_exc=exclude) diff --git a/tests/pjsua/scripts-sendto/200_ice_success_4.py b/tests/pjsua/scripts-sendto/200_ice_success_4.py index 0ec3849c..ede6a430 100644 --- a/tests/pjsua/scripts-sendto/200_ice_success_4.py +++ b/tests/pjsua/scripts-sendto/200_ice_success_4.py @@ -30,6 +30,5 @@ exclude = [ sendto_cfg = sip.SendtoCfg( "pjsua with --ice-no-rtcp ignores RTCP things in the SDP", pjsua_args=args, sdp=sdp, resp_code=200, - resp_inc=include, resp_exc=exclude, - enable_buffer = True) + resp_inc=include, resp_exc=exclude) |