Changeset 2028

Timestamp:

Jun 16, 2008 1:04:44 PM (16 years ago)

Author:

bennylp

Message:

More ticket #543: updated automated tests to run on Unix

Location:

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

Files:

• run.py (modified) (4 diffs)
• runall.py (modified) (2 diffs)
• scripts-call/200_tcp.py (modified) (1 diff)
• scripts-pres (modified) (1 prop)
• scripts-pres/200_publish.py (modified) (3 diffs)
• scripts-run/100_simple.py (modified) (2 diffs)
• scripts-run/200_register.py (modified) (2 diffs)

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

@@ -1 @@
-# $Id:$
+# $Id$
 import sys
 import imp
 import re
+import os
 import subprocess
+import random
 import time
 
 import inc_const as const
 
-# Defaults
-G_EXE="..\\..\\bin\\pjsua_vc6d.exe"
+# Get the pjsua executable name
+if sys.platform.find("win32")!=-1:
+    e = "../../bin/pjsua_vc6d.exe"
+    st1 = os.stat(e)
+    if st1 != None:
+        G_EXE = e
+    e = "../../bin/pjsua_vc6d.exe"
+    st2 = os.stat(e)
+    if st2 != None and st2.st_mtime > st1.st_mtime:
+        G_EXE = e
+        st1 = st2
+    if G_EXE=="":
+        print "Unable to find valid pjsua. Please build pjsip first"
+        sys.exit(1)
+    G_INUNIX = False
+else:
+    f = open("../../../build.mak", "r")
+    while True:
+        line = f.readline()
+        if not line:
+            break
+        if line.find("TARGET_NAME")!=-1:
+            print line
+            G_EXE="../../bin/pjsua-" + line.split(":= ")[1]
+            break
+    if G_EXE=="":
+        print "Unable to find ../../../build.mak. Please build pjsip first"
+        sys.exit(1)
+    G_INUNIX = True
+
+
+G_EXE = G_EXE.rstrip("\n\r \t")
 
 ###################################
@@ -36 +68 @@
                 fullcmd = G_EXE + " " + inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
                 self.trace("Popen " + fullcmd)
-                self.proc = subprocess.Popen(fullcmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
+                self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
         def send(self, cmd):
                 self.trace("send " + cmd)
@@ -109 +141 @@
 script = imp.load_source("script", sys.argv[1])  
 
+# Init random seed
+random.seed()
+
 # Validate
 if script.test == None:
@@ -120 +155 @@
 # Instantiate pjsuas
 print "====== Running " + script.test.title + " ======"
+print "Using " + G_EXE + " as pjsua executable"
+
 for inst_param in script.test.inst_params:
         try:

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

@@ -2 +2 @@
 import os
 import sys
+
+# Usage:
+#  runall.py [test-to-resume]
+
 
 # Initialize test list
@@ -29 +33 @@
     tests = [t for t in tests if t.find(pat)==-1]
 
+# Resume test?
+resume_script=""
+if len(sys.argv) > 1:
+    if sys.argv[1][0]=='-' or sys.argv[1][0]=='/':
+        print "Usage:"
+        print "  runall.py [RESUME]"
+        print "where"
+        print "  RESUME is string/substring to specify where to resume tests."
+        print "  If this argument is omited, tests will start from the beginning."
+        sys.exit(0)
+    resume_script=sys.argv[1]
+
+
 # Now run the tests
 for t in tests:
+        if resume_script!="" and t.find(resume_script)==-1:
+            print "Skipping " + t +".."
+            continue
+        resume_script=""
         cmdline = "python run.py " + t
         print "Running " + cmdline

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-call/200_tcp.py

@@ -7 +7 @@
                 "TCP transport",
                 [
-                        InstanceParam("callee", "--null-audio --no-udp", uri_param=";transport=tcp --max-calls=1"),
+                        InstanceParam("callee", "--null-audio --no-udp --max-calls=1", uri_param=";transport=tcp"),
                         InstanceParam("caller", "--null-audio --no-udp --max-calls=1")
                 ]

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-pres/200_publish.py

@@ -1 @@
-# $Id:$
+# $Id$
 #
 from inc_cfg import *
@@ -9 +9 @@
                         InstanceParam(  "ua1", 
                                         "--null-audio"+
-                                                " --id=<sip:test1@pjsip.org>"+
+                                                " --id=\"<sip:test1@pjsip.org>\""+
                                                 " --registrar=sip:sip.pjsip.org" +
                                                 " --username=test1" +
                                                 " --password=test1" +
                                                 " --realm=*" +
-                                                " --proxy=sip:sip.pjsip.org;lr" +
+                                                " --proxy=\"sip:sip.pjsip.org;lr\"" +
                                                 " --publish",
                                         uri="<sip:test1@pjsip.org>",
@@ -21 +21 @@
                         InstanceParam(  "ua2", 
                                         "--null-audio"+
-                                                " --id=<sip:test2@pjsip.org>"+
+                                                " --id=\"<sip:test2@pjsip.org>\""+
                                                 " --registrar=sip:sip.pjsip.org" +
                                                 " --username=test2" +
                                                 " --password=test2" +
                                                 " --realm=*" +
-                                                " --proxy=sip:sip.pjsip.org;lr" +
+                                                " --proxy=\"sip:sip.pjsip.org;lr\"" +
                                                 " --publish",
                                         uri="<sip:test2@pjsip.org>",

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

@@ -1 @@
-# $Id:$
+# $Id$
 #
 # Just about the simple pjsua command line parameter, which should
@@ -8 +8 @@
                 "Basic run", 
                 [
-                        InstanceParam("pjsua", "--null-audio --local-port 0 --rtp-port 0")
+                        InstanceParam("pjsua", "--null-audio --rtp-port 0")
                 ]
                 )

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

@@ -1 @@
-# $Id:$
+# $Id$
 #
 from inc_cfg import *
@@ -9 +9 @@
                         InstanceParam(  "client", 
                                         "--null-audio"+
-                                                " --id=<sip:test1@pjsip.org>"+
+                                                " --id=\"<sip:test1@pjsip.org>\""+
                                                 " --registrar=sip:sip.pjsip.org" +
                                                 " --username=test1" +