Changeset 2069

Timestamp:

Jun 26, 2008 10:20:11 PM (16 years ago)

Author:

bennylp

Message:

echo command in pjsua can be used to print any text, and this is used to better synchronize stdout in Python test apps

Location:

pjproject/trunk/pjsip-apps/src

Files:

• pjsua/pjsua_app.c (modified) (2 diffs)
• test-pjsua/run.py (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2493 +2493 @@
     puts("|  S  Send arbitrary REQUEST   | Cp  Codec priorities     |  f  Save config   |");
     puts("+------------------------------+--------------------------+-------------------+");
-    puts("|  q  QUIT       sleep MS     echo [0|1]            n: detect NAT type        |");
+    puts("|  q  QUIT       sleep MS     echo [0|1|txt]        n: detect NAT type        |");
     puts("+=============================================================================+");
 
@@ -3545 +3545 @@
                 }
 
-                cmd_echo = pj_strtoul(&tmp);
+                cmd_echo = *tmp.ptr != '0' || tmp.slen!=1;
             }
             break;

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

@@ -55 +55 @@
         ra = re.compile(const.ASSERT, re.I)
         rr = re.compile(const.STDOUT_REFRESH)
+        t0 = time.time()
         def __init__(self, inst_param):
                 self.inst_param = inst_param
@@ -99 +100 @@
         def sync_stdout(self):
                 self.trace("sync_stdout")
-                self.send("echo 1")
-                self.expect("echo 1")
+                cmd = "echo 1" + str(random.randint(1000,9999))
+                self.send(cmd)
+                self.expect(cmd)
 
         def wait(self):
@@ -107 +109 @@
         def trace(self, s):
                 if self.trace_enabled:
-                        print self.name + ": " + "====== " + s + " ======"
+                        now = time.time()
+                        fmt = self.name + ": " + "================== " + s + " ==================" + " [at t=%(time)03d]"
+                        print fmt % {'time':int(now - self.t0)}
 
 #########################