Changeset 4183

Timestamp:

Jun 28, 2012 9:16:03 AM (12 years ago)

Author:

nanang

Message:

Re #1523:

• runall.py: fix option parser
• run.py: avoid double newlines in logging
• mod_sipp.py: redirect sipp output to /dev/null & add sipp error string
• misc fixes on sipp scenarios, e.g: regex to get via branch, file rename.

Location:

pjproject/trunk/tests/pjsua

Files:

• mod_sipp.py (modified) (6 diffs)
• run.py (modified) (1 diff)
• runall.py (modified) (2 diffs)
• scripts-sipp/transfer-attended.py (modified) (3 diffs)
• scripts-sipp/transfer-unattended.py (modified) (2 diffs)
• scripts-sipp/uas-forked-100rel.xml (modified) (1 diff)
• scripts-sipp/uas-forked-200.xml (modified) (1 diff)
• scripts-sipp/uas-inv-answered-with-srtp.xml (moved) (moved from pjproject/trunk/tests/pjsua/scripts-sipp/uas-invite.xml)
• scripts-sipp/uas-prack_fork.xml (modified) (1 diff)
• scripts-sipp/uas-reinv-and-ack-same-branch-without-sdp.xml (moved) (moved from pjproject/trunk/tests/pjsua/scripts-sipp/uas-reinv-and-ack(same-branch)-without-sdp.xml)

pjproject/trunk/tests/pjsua/mod_sipp.py

@@ -17 +17 @@
     G_INUNIX = True
 
+# /dev/null handle, for redirecting output when SIPP is not in background mode
+FDEVNULL = None
+
 # SIPp executable path and param
 #SIPP_PATH = '"C:\\Program Files (x86)\\Sipp_3.2\\sipp.exe"'
@@ -25 +28 @@
 # On non-BG mode, on win, it needs env var: "TERMINFO=c:\cygwin\usr\share\terminfo"
 # TODO: on unix with BG mode, waitpid() always fails, need to be fixed
-#SIPP_BG_MODE = True
-SIPP_BG_MODE = not G_INUNIX
+SIPP_BG_MODE = False
+#SIPP_BG_MODE = not G_INUNIX
 
 # Will be updated based on configuration file (a .py file whose the same name as SIPp XML file)
@@ -80 +83 @@
         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)
+        # redirect output to NULL
+        global FDEVNULL
+        FDEVNULL  = open(os.devnull, 'w')
+        sipp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=FDEVNULL, stderr=FDEVNULL)
 
     if not SIPP_BG_MODE:
@@ -115 +121 @@
 def wait_sipp(sipp):
     if not SIPP_BG_MODE:
+        global FDEVNULL
         sipp.wait()
+        FDEVNULL.close()
         return sipp.returncode
 
@@ -176 +184 @@
     # Ideally the poll should be done contiunously until SIPp process is
     # terminated.
-    ua[0].expect(inc_const.STDOUT_REFRESH, raise_on_error = False)
+    for ua_idx in range(len(ua)):
+        ua[ua_idx].expect(inc_const.STDOUT_REFRESH, raise_on_error = False)
 
     return ua_err_st
+
+
+def sipp_err_to_str(err_code):
+    if err_code == 0:
+        return "All calls were successful"
+    elif err_code == 1:
+        return "At least one call failed"
+    elif err_code == 97:
+        return "exit on internal command. Calls may have been processed"
+    elif err_code == 99:
+        return "Normal exit without calls processed"
+    elif err_code == -1:
+        return "Fatal error (timeout)"
+    elif err_code == -2:
+        return "Fatal error binding a socket"
+    else:
+        return "Unknown error"
 
 
@@ -199 +225 @@
 
     if sipp_ret_code:
-        raise TestError("SIPp returned error " + str(sipp_ret_code))
+        rc = ctypes.c_byte(sipp_ret_code).value
+        raise TestError("SIPp returned error " + str(rc) + ": " + sipp_err_to_str(rc))
 
 

pjproject/trunk/tests/pjsua/run.py

@@ -144 +144 @@
                         # Print the line if echo is ON
                         if self.echo:
-                                print self.name + ": " + line,
+                                print self.name + ": " + line.rstrip()
                         # Trap assertion error
                         if self.ra.search(line) != None:

pjproject/trunk/tests/pjsua/runall.py

@@ -94 +94 @@
                         resume_script=sys.argv[1]
                         sys.argv.pop(0)
-                        sys.argv.pop(1)
+                        sys.argv.pop(0)
                 else:
                         sys.argv.pop(0)
@@ -120 +120 @@
                         shell_cmd = sys.argv[1]
                         sys.argv.pop(0)
-                        sys.argv.pop(1)
+                        sys.argv.pop(0)
                 else:
                         sys.argv.pop(0)
                         sys.stderr.write("Error: argument value required")
                         sys.exit(1)
+        else:
+                # should be run.py options
+                break
 
 
 # Generate arguments for run.py
-argv_st = " ".join(sys.argv)
+argv_st = " ".join(sys.argv) + " "
 
 # Init vars

pjproject/trunk/tests/pjsua/scripts-sipp/transfer-attended.py

@@ -12 +12 @@
                  [0, "", "m"],
                  [0, "", "sip:localhost:5062"],
+                 [0, const.STATE_CALLING, ""],
                  [1, const.EVENT_INCOMING_CALL, "a"],
                  [1, "", "200"],
@@ -25 +26 @@
                  [1, "", "m"],
                  [1, "", "sip:localhost:5064"],
+                 [1, const.STATE_CALLING, ""],
                  [2, const.EVENT_INCOMING_CALL, "a"],
                  [2, "", "200"],
@@ -47 +49 @@
                  [0, const.MEDIA_ACTIVE, ""],
                  [2, const.MEDIA_ACTIVE, ""],
-                 [1, "", " "],
-                 [1, "have 0 active call", ""],
+                 [1, const.STATE_DISCONNECTED, ""]
                 ]

pjproject/trunk/tests/pjsua/scripts-sipp/transfer-unattended.py

@@ -12 +12 @@
                  [0, "", "m"],
                  [0, "", "sip:localhost:5062"],
+                 [0, const.STATE_CALLING, ""],
                  [1, const.EVENT_INCOMING_CALL, "a"],
                  [1, "", "200"],
@@ -26 +27 @@
                  [2, const.MEDIA_ACTIVE, ""],
                  [1, "call transfered successfully", ""],
-                 [1, "", " "],
-                 [1, "have 0 active call", ""],
+                 [1, const.STATE_DISCONNECTED, ""]
                 ]

pjproject/trunk/tests/pjsua/scripts-sipp/uas-forked-100rel.xml

@@ -23 +23 @@
   <recv request="INVITE" crlf="true">
    <action>
-    <ereg regexp="branch=([0-9a-zA-Z\-]*)"
+    <ereg regexp="branch=([^;]*)"
           search_in="hdr"
-          header="Via"
+          header="Via"
           assign_to="1,2"/>
     <assign assign_to="1" variable="2"/>

pjproject/trunk/tests/pjsua/scripts-sipp/uas-forked-200.xml

@@ -23 +23 @@
   <recv request="INVITE" crlf="true">
    <action>
-    <ereg regexp="branch=([0-9a-zA-Z]*)"
+    <ereg regexp="branch=([^;]*)"
           search_in="hdr"
-          header="Via"
+          header="Via"
           assign_to="1,2"/>
     <assign assign_to="1" variable="2"/>

pjproject/trunk/tests/pjsua/scripts-sipp/uas-prack_fork.xml

@@ -23 +23 @@
   <recv request="INVITE" crlf="true">
    <action>
-    <ereg regexp="branch=([0-9a-zA-Z]*)"
-          search_in="msg"
+    <ereg regexp="branch=([^;]*)"
+          search_in="hdr"
+          header="Via"
           assign_to="3"/>
     <ereg regexp="CSeq: ([0-9a-zA-Z ]*)"