Changeset 2013

Timestamp:

Jun 12, 2008 7:13:51 PM (16 years ago)

Author:

bennylp

Message:

Ticket #543: added TCP call in pjsua unit test

Location:

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

Files:

• inc_cfg.py (modified) (1 diff)
• inc_param.py (modified) (1 diff)
• mod_call.py (modified) (1 diff)
• run.py (modified) (6 diffs)
• scripts-call/200_tcp.py (added)

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

@@ -19 +19 @@
 # Call config class
 class CallConfig:
+        # additional parameter to be added to target URI
+        uri_param = ""
         def __init__(self, title, callee_cfg, caller_cfg):
                 self.title = title

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

@@ -32 +32 @@
 class Test:
         title = ""
-        # params is list containing PjsuaParam objects
+        # params is list containing Pjsua objects
         run = []
         # list of Expect instances, to be filled at run-time by

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

@@ -36 +36 @@
         # Caller making call
         caller.send("m")
-        caller.send("sip:localhost:" + port1)
+        caller.send("sip:localhost:" + port1 + cfg_file.config.uri_param)
         caller.expect(const.STATE_CALLING)
         

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

@@ -48 +48 @@
                         line = self.proc.stdout.readline()
                         if line == "":
-                                raise TestError("Premature EOF")
+                                raise TestError(self.name + ": Premature EOF")
                         # Print the line if echo is ON
                         if self.echo:
@@ -54 +54 @@
                         # Trap assertion error
                         if self.ra.search(line) != None:
-                                raise TestError(line)
+                                if raise_on_error:
+                                        raise TestError(self.name + ": " + line)
+                                else:
+                                        return None
                         # Count stdout refresh text. 
                         if self.rr.search(line) != None:
@@ -61 +64 @@
                                         self.trace("Timed-out!")
                                         if raise_on_error:
-                                                raise TestError("Timeout expecting pattern: " + pattern)
+                                                raise TestError(self.name + ": Timeout expecting pattern: " + pattern)
                                         else:
                                                 return None             # timeout
@@ -81 +84 @@
         for p in t.process:
                 p.send("q")
-                p.expect(const.DESTROYED)
+                p.expect(const.DESTROYED, False)
                 p.wait()
         print "Test completed with error: " + errmsg
@@ -118 +121 @@
                 p.send("echo 1")
                 p.send("echo 1")
+                p.expect("echo 1")
                 # add running instance
                 script.test.process.append(p)
@@ -144 +148 @@
         p.send("q")
         time.sleep(0.5)
-        p.expect(const.DESTROYED)
+        p.expect(const.DESTROYED, False)
         p.wait()