Changeset 2036 for pjproject

Timestamp:

Jun 20, 2008 5:43:55 PM (16 years ago)

Author:

nanang

Message:

More ticket #543: added SRTP tests on scripts-sendto

Location:

pjproject/trunk/pjsip-apps/src/test-pjsua

Files:

• mod_media_playrec.py (modified) (2 diffs)
• run.py (modified) (2 diffs)
• scripts-sendto/100_simplecall.py (modified) (2 diffs)
• scripts-sendto/300_srtp_crypto_case_insensitive.py (added)
• scripts-sendto/300_srtp_duplicated_crypto_tag.py (added)
• scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py (added)
• scripts-sendto/300_srtp_invalid_crypto_tag_zero.py (added)
• scripts-sendto/300_srtp_receive_no_key_1.py (added)
• scripts-sendto/300_srtp_receive_no_key_2.py (added)
• scripts-sendto/300_srtp_receive_no_key_3.py (added)
• scripts-sendto/301_srtp0_recv_avp.py (added)
• scripts-sendto/301_srtp0_recv_savp.py (added)
• scripts-sendto/310_srtp1_no_crypto.py (added)
• scripts-sendto/311_srtp1_recv_avp.py (added)
• scripts-sendto/312_srtp1_recv_savp.py (added)
• scripts-sendto/313_srtp1_unsupported_crypto.py (added)
• scripts-sendto/320_srtp2_no_crypto.py (added)
• scripts-sendto/321_srtp2_recv_avp.py (added)
• scripts-sendto/322_srtp2_recv_savp.py (added)
• scripts-sendto/323_srtp2_unsupported_crypto.py (added)

pjproject/trunk/pjsip-apps/src/test-pjsua/mod_media_playrec.py

@@ -2 +2 @@
 
 # PLAYFILE -> RECFILE:
-# input file is played and is recorded to output, then compare them.
+# Input file is played and is recorded to output, then compare them.
+# Useful to tes clock rates compatibility and resample quality
 #       null-audio
 #       port 1: wav file input xxxxxx.clock_rate.wav, e.g: test1.8.wav
 #       port 2: wav file ouput xxxxxx.clock_rate.wav, e.g: res1.8.wav
-#       wav input more than 3 seconds
+#       wav input must be more than 3 seconds long
 
 import time
@@ -76 +77 @@
         endpt.trace("Popen " + fullcmd)
         cmp_proc = subprocess.Popen(fullcmd, stdout=subprocess.PIPE, universal_newlines=True)
+
+        # Parse similarity ouput
         line = cmp_proc.stdout.readline()
-        endpt.trace("WAV similarity = " + line)
+        mo_sim_val = re.match(".+=\s+(\d+)", line)
+        if (mo_sim_val == None):
+                raise TestError("Error comparing WAV files")
+                return
+
+        # Evaluate the similarity value
+        sim_val = mo_sim_val.group(1)
+        if (sim_val > 0):
+                endpt.trace("WAV similarity = " + sim_val)
+        else:
+                raise TestError("Degraded WAV heavily distorted")
 
 

pjproject/trunk/pjsip-apps/src/test-pjsua/run.py

@@ -110 +110 @@
 #########################
 # Error handling
-def handle_error(errmsg, t):
+def handle_error(errmsg, t, close_processes = True):
         print "====== Caught error: " + errmsg + " ======"
-        time.sleep(1)
-        for p in t.process:
-                p.send("q")
-                p.send("q")
-                p.expect(const.DESTROYED, False)
-                p.wait()
+        if (close_processes):
+                time.sleep(1)
+                for p in t.process:
+                        p.send("q")
+                        p.send("q")
+                        p.expect(const.DESTROYED, False)
+                        p.wait()
         print "Test completed with error: " + errmsg
         sys.exit(1)
@@ -196 +197 @@
                 script.test.post_func(script.test, script.test.user_data)
         except TestError, e:
-                handle_error(e.desc, script.test)
+                handle_error(e.desc, script.test, False)
 
 # Done

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-sendto/100_simplecall.py

@@ -1 @@
-# $Id:$
+# $Id$
 import inc_sip as sip
 import inc_sdp as sdp
@@ -17 +17 @@
 """
 
-sendto_cfg = sip.SendtoCfg( "simple call", "--null-audio", sdp, 200)
+sendto_cfg = sip.SendtoCfg( "simple call", "--null-audio --auto-answer 200", sdp, 200)