Changeset 2062

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)
• mod_call.py (modified) (6 diffs)
• 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/mod_call.py

@@ -71 +71 @@
         # Hold call by caller
         caller.send("H")
-        caller.sync_stdout()
+        #caller.sync_stdout()
         caller.expect(const.MEDIA_HOLD)
         callee.expect(const.MEDIA_HOLD)
@@ -82 +82 @@
         time.sleep(2)
         caller.send("v")
-        caller.sync_stdout()
-        callee.expect(const.MEDIA_ACTIVE)
-        caller.expect(const.MEDIA_ACTIVE)
+        #caller.sync_stdout()
+        callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+        caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
 
         # Synchronize stdout
@@ -100 +100 @@
         # Hold call by callee
         callee.send("H")
-        callee.sync_stdout()
+        #callee.sync_stdout()
         caller.expect(const.MEDIA_HOLD)
         callee.expect(const.MEDIA_HOLD)
@@ -111 +111 @@
         time.sleep(2)
         callee.send("v")
-        callee.sync_stdout()
-        caller.expect(const.MEDIA_ACTIVE)
-        callee.expect(const.MEDIA_ACTIVE)
+        #callee.sync_stdout()
+        caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+        callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
 
         # Synchronize stdout
@@ -129 +129 @@
         # UPDATE (by caller)
         caller.send("U")
-        caller.sync_stdout()
-        callee.expect(const.MEDIA_ACTIVE)
-        caller.expect(const.MEDIA_ACTIVE)
+        #caller.sync_stdout()
+        callee.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+        caller.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
         
         # Synchronize stdout
@@ -144 +144 @@
         # UPDATE (by callee)
         callee.send("U")
-        callee.sync_stdout()
-        caller.expect(const.MEDIA_ACTIVE)
-        callee.expect(const.MEDIA_ACTIVE)
-        
-        # Synchronize stdout
-        caller.sync_stdout()
-        callee.sync_stdout()
-
-        # Test that media is okay
-        time.sleep(2)
-        check_media(caller, callee)
-        check_media(callee, caller)
+        #callee.sync_stdout()
+        caller.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+        callee.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+        
+        # Synchronize stdout
+        caller.sync_stdout()
+        callee.sync_stdout()
+
+        # Test that media is okay
+        time.sleep(2)
+        check_media(caller, callee)
+        check_media(callee, caller)
+
+        # Synchronize stdout
+        caller.sync_stdout()
+        callee.sync_stdout()
+
+        # Set codecs in both caller and callee so that there is
+        # no common codec between them.
+        # In caller we only enable PCMU, in callee we only enable PCMA
+        caller.send("Cp")
+        caller.send("* 0")
+        caller.send("Cp")
+        caller.send("pcmu 120")
+        
+        callee.send("Cp")
+        callee.send("* 0")
+        callee.send("Cp")
+        callee.send("pcma 120")
+
+        # Test when UPDATE fails (by callee)
+        callee.send("U")
+        caller.expect("SIP/2.0 488")
+        callee.expect("SIP/2.0 488")
+        callee.sync_stdout()
+        caller.sync_stdout()
+        
+        # Test that media is still okay
+        time.sleep(2)
+        check_media(caller, callee)
+        check_media(callee, caller)
+
+        # Test when UPDATE fails (by caller)
+        caller.send("U")
+        callee.expect("SIP/2.0 488")
+        caller.expect("SIP/2.0 488")
+        caller.sync_stdout()
+        callee.sync_stdout()
+        
+        # Test that media is still okay
+        time.sleep(2)
+        check_media(callee, caller)
+        check_media(caller, callee)
 
         # Hangup call

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