Changeset 2029

Timestamp:

Jun 18, 2008 9:04:14 PM (16 years ago)

Author:

nanang

Message:

Added new callback for module: post_func (called at the end of the test), added userdata param for modules, and added new module media_playrec with some scripts

Location:

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

Files:

• inc_cfg.py (modified) (2 diffs)
• inc_const.py (modified) (2 diffs)
• mod_call.py (modified) (2 diffs)
• mod_media_playrec.py (added)
• mod_pres.py (modified) (2 diffs)
• run.py (modified) (2 diffs)
• scripts-media-playrec (added)
• scripts-media-playrec/100_resample_lf_11_16.py (added)
• scripts-media-playrec/100_resample_lf_11_22.py (added)
• scripts-media-playrec/100_resample_lf_11_32.py (added)
• scripts-media-playrec/100_resample_lf_11_44.py (added)
• scripts-media-playrec/100_resample_lf_11_48.py (added)
• scripts-media-playrec/100_resample_lf_11_8.py (added)
• scripts-media-playrec/100_resample_lf_8_11.py (added)
• scripts-media-playrec/100_resample_lf_8_16.py (added)
• scripts-media-playrec/100_resample_lf_8_22.py (added)
• scripts-media-playrec/100_resample_lf_8_32.py (added)
• scripts-media-playrec/100_resample_lf_8_44.py (added)
• scripts-media-playrec/100_resample_lf_8_48.py (added)
• tools (added)
• tools/cmp_wav.c (added)
• tools/cmp_wav.exe (added)

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

@@ -1 @@
-# $Id:$
+# $Id$
 import random
 
@@ -72 +72 @@
         # the function for test body
         test_func = None
+        post_func = None
+        user_data = None
         def __init__(   self, 
                         title,          # Test title
                         inst_params,    # InstanceParam's as list
-                        func=None):
+                        func=None,
+                        post_func=None,
+                        user_data=None):
                 self.title = title
                 self.inst_params = inst_params
                 self.test_func = func
+                self.post_func = post_func
+                self.user_data = user_data
 
 

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

@@ -1 @@
-# $Id:$
+# $Id$
 # Useful constants
 
@@ -35 +35 @@
 
 ##########################
+# MEDIA
+#
+
+# Connecting/disconnecting ports
+MEDIA_CONN_PORT_SUCCESS = "Port \d+ \(.+\) transmitting to port"
+MEDIA_DISCONN_PORT_SUCCESS = "Port \d+ \(.+\) stop transmitting to port"
+
+# Filename to play / record
+MEDIA_PLAY_FILE = "--play-file (\S+)"
+MEDIA_REC_FILE = "--rec-file (\S+)"
+
+##########################
 # MISC
 #

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

@@ -1 @@
-# $Id:$
+# $Id$
 import time
 import imp
@@ -10 +10 @@
 
 # Test body function
-def test_func(t):
+def test_func(t, user_data):
         callee = t.process[0]
         caller = t.process[1]

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

@@ -1 @@
-# $Id:$
+# $Id$
 import time
 import imp
@@ -10 +10 @@
 
 # Test body function
-def test_func(t):
+def test_func(t, user_data):
         u1 = t.process[0]
         uri1 = cfg_file.test_param.inst_params[0].uri

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

@@ -179 +179 @@
 if script.test.test_func != None:
         try:
-                script.test.test_func(script.test)
+                script.test.test_func(script.test, script.test.user_data)
         except TestError, e:
                 handle_error(e.desc, script.test)
@@ -197 +197 @@
         p.wait()
 
+# Run the post test function
+if script.test.post_func != None:
+        try:
+                script.test.post_func(script.test, script.test.user_data)
+        except TestError, e:
+                handle_error(e.desc, script.test)
+
 # Done
 print "Test " + script.test.title + " completed successfully"