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

Timestamp:

Jun 26, 2008 4:27:17 PM (16 years ago)

Author:

bennylp

Message:

Set universal_newlines=False in run.py, and added failed UPDATE scenario in mod_call.py

Location:

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

Files:

• . (modified) (1 prop)
• run.py (modified) (2 diffs)

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

@@ -1 +1 @@
 *.pyc
 *log
+p*.txt

@@ -1 +1 @@
 *.pyc
 *log
+p*.txt

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

@@ -62 +62 @@
                 fullcmd = G_EXE + " " + inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
                 self.trace("Popen " + fullcmd)
-                self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, 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=False)
         def send(self, cmd):
                 self.trace("send " + cmd)
                 self.proc.stdin.writelines(cmd + "\n")
-        def expect(self, pattern, raise_on_error=True):
+                self.proc.stdin.flush()
+        def expect(self, pattern, raise_on_error=True, title=""):
                 self.trace("expect " + pattern)
                 r = re.compile(pattern, re.I)
@@ -89 +90 @@
                                         self.trace("Timed-out!")
                                         if raise_on_error:
-                                                raise TestError(self.name + ": Timeout expecting pattern: " + pattern)
+                                                raise TestError(self.name + " " + title + ": Timeout expecting pattern: \"" + pattern + "\"")
                                         else:
                                                 return None             # timeout

@@ -1 +1 @@
 *.pyc
 *log
+p*.txt