Changeset 2884

Timestamp:

Aug 17, 2009 8:29:47 AM (15 years ago)

Author:

bennylp

Message:

Misc (#915): several fixes on the python unit tests on Linux:

• added Makefile for cmp_wav and modified the test script
• test 999: MESSAGE without body is now allowed

Location:

pjproject/trunk/tests/pjsua

Files:

• mod_media_playrec.py (modified) (2 diffs)
• scripts-sendto/999_message_no_body.py (modified) (2 diffs)
• tools (modified) (1 prop)
• tools/Makefile (added)

pjproject/trunk/tests/pjsua/mod_media_playrec.py

@@ -21 +21 @@
 
 # WAV similarity calculator
-COMPARE_WAV_EXE = "tools/cmp_wav.exe"
+COMPARE_WAV_EXE = ""
+if sys.platform.find("win32")!=-1:
+    COMPARE_WAV_EXE = "tools/cmp_wav.exe"
+    G_INUNIX = False
+else:
+    COMPARE_WAV_EXE = "tools/cmp_wav"
+    G_INUNIX = True
+
 
 # Threshold to declare degradation is too high when result is lower than this value
@@ -79 +86 @@
         fullcmd = COMPARE_WAV_EXE + " " + input_filename + " " + output_filename + " " + "3000"
         endpt.trace("Popen " + fullcmd)
-        cmp_proc = subprocess.Popen(fullcmd, stdout=subprocess.PIPE, universal_newlines=True)
+        cmp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=subprocess.PIPE, universal_newlines=True)
 
         # Parse similarity ouput

pjproject/trunk/tests/pjsua/scripts-sendto/999_message_no_body.py

@@ -3 +3 @@
 import inc_sdp as sdp
 
-# There's some report that incoming MESSAGE without body will crash pjsua
+# Incoming MESSAGE without body is now accepted
 #
 complete_msg = \
@@ -21 +21 @@
 
 sendto_cfg = sip.SendtoCfg( "empty MESSAGE", "--null-audio --auto-answer 200", 
-                            "", 488, complete_msg=complete_msg)
+                            "", 200, complete_msg=complete_msg)
 

pjproject/trunk/tests/pjsua/tools

@@ -1 +1 @@
 pe*
+cmp_wav

@@ -1 +1 @@
 pe*
+cmp_wav

@@ -1 +1 @@
 pe*
+cmp_wav