Changeset 2084

Timestamp:

Jun 27, 2008 11:53:00 PM (16 years ago)

Author:

bennylp

Message:

Added stdout buffering option in Python tests

Location:

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

Files:

• inc_cfg.py (modified) (4 diffs)
• inc_sip.py (modified) (2 diffs)
• run.py (modified) (1 diff)
• scripts-call/300_ice_1_1.py (modified) (1 diff)
• scripts-sendto/200_ice_success_2.py (modified) (2 diffs)

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

@@ -29 +29 @@
         # Does this have PUBLISH?
         have_publish = False
+        # Enable stdout buffer?
+        enable_buffer = False
         def __init__(   self, 
                         name,                   # Instance name
@@ -38 +40 @@
                         have_publish=False,     # Have publish?
                         echo_enabled=DEFAULT_ECHO, 
-                        trace_enabled=DEFAULT_TRACE):
+                        trace_enabled=DEFAULT_TRACE,
+                        enable_buffer = False):
                 # Instance name
                 self.name = name
@@ -63 +66 @@
                 self.echo_enabled = echo_enabled
                 self.trace_enabled = trace_enabled
+                self.enable_buffer = enable_buffer
 
 
@@ -84 +88 @@
                         func=None,
                         skip=False,
-                        post_func=None):
+                        post_func=None,
+                        need_stdout_buffer=False):
                 self.title = title
                 self.inst_params = inst_params

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

@@ -225 +225 @@
         def __init__(self, name, pjsua_args, sdp, resp_code, 
                      resp_inc=[], resp_exc=[], use_tcp=False,
-                     extra_headers="", complete_msg=""):
+                     extra_headers="", complete_msg="",
+                     enable_buffer = False):
                 self.complete_msg = complete_msg
                 self.sdp = sdp
@@ -234 +235 @@
                 self.extra_headers = extra_headers
                 self.inst_param = cfg.InstanceParam("pjsua", pjsua_args)
-
+                self.inst_param.enable_buffer = enable_buffer 
+

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

@@ -109 +109 @@
                 self.echo = inst_param.echo_enabled
                 self.trace_enabled = inst_param.trace_enabled
-                fullcmd = G_EXE + " " + inst_param.arg + " --stdout-no-buf --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
+                fullcmd = G_EXE + " " + inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
+                if not inst_param.enable_buffer:
+                        fullcmd = fullcmd + " --stdout-no-buf"
                 self.trace("Popen " + fullcmd)
                 self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=False)

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-call/300_ice_1_1.py

@@ -7 +7 @@
                 "Callee=use ICE, caller=use ICE",
                 [
-                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1"),
-                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1")
+                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1", enable_buffer=True),
+                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1", enable_buffer=True)
                 ]
                 )

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-sendto/200_ice_success_2.py

@@ -1 @@
-# $Id:$
+# $Id$
 import inc_sip as sip
 import inc_sdp as sdp
@@ -32 +32 @@
 sendto_cfg = sip.SendtoCfg( "caller sends only one component", 
                             pjsua_args=args, sdp=sdp, resp_code=200, 
-                            resp_inc=include, resp_exc=exclude)
+                            resp_inc=include, resp_exc=exclude,
+                            enable_buffer = True)