Changeset 4179 for pjproject

Timestamp:

Jun 26, 2012 7:37:48 AM (12 years ago)

Author:

nanang

Message:

Re #1523: fixed mod_sipp.py problems in executing sipp on unix/mac platforms, i.e: should run on shell and non-background mode.

File:

• pjproject/trunk/tests/pjsua/mod_sipp.py (modified) (4 diffs)

pjproject/trunk/tests/pjsua/mod_sipp.py

@@ -10 +10 @@
 import inc_const
 
+# flags that test is running in Unix
+G_INUNIX = False
+if sys.platform.lower().find("win32")!=-1 or sys.platform.lower().find("microsoft")!=-1:
+    G_INUNIX = False
+else:
+    G_INUNIX = True
+
 # SIPp executable path and param
 #SIPP_PATH = '"C:\\Program Files (x86)\\Sipp_3.2\\sipp.exe"'
@@ -17 +24 @@
 # On BG mode, SIPp doesn't require special terminal
 # On non-BG mode, on win, it needs env var: "TERMINFO=c:\cygwin\usr\share\terminfo"
-SIPP_BG_MODE = True
+# TODO: on unix with BG mode, waitpid() always fails, need to be fixed
+#SIPP_BG_MODE = True
+SIPP_BG_MODE = not G_INUNIX
 
 # Will be updated based on configuration file (a .py file whose the same name as SIPp XML file)
@@ -34 +43 @@
 else:
     exit(-99)
+
 
 # Init PJSUA test instance
@@ -68 +78 @@
     print "Running SIPP: " + fullcmd
     if SIPP_BG_MODE:
-        sipp_proc = subprocess.Popen(fullcmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=False)
-    else:
-        sipp_proc = subprocess.Popen(fullcmd)
+        sipp_proc = subprocess.Popen(fullcmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=G_INUNIX, universal_newlines=False)
+    else:
+        sipp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX)
 
     if not SIPP_BG_MODE: