Changeset 2410 for pjproject/trunk/tests/pjsua/run.py

Timestamp:

Jan 2, 2009 6:15:07 PM (15 years ago)

Author:

bennylp

Message:

Test refinements for mingw etc.

File:

• pjproject/trunk/tests/pjsua/run.py (modified) (2 diffs)

pjproject/trunk/tests/pjsua/run.py

@@ -162 +162 @@
         def wait(self):
                 self.trace("wait")
-                self.proc.wait()
+                self.proc.communicate("q")
+
         def trace(self, s):
                 if self.trace_enabled:
@@ -178 +179 @@
                         p.send("q")
                         p.send("q")
-                        p.expect(const.DESTROYED, False)
-                        p.wait()
+                        is_err = False
+                        try:
+                                ret = p.expect(const.DESTROYED, False)
+                                if not ret:
+                                        is_err = True
+                        except:
+                                is_err = True
+                        if is_err:
+                                if sys.hexversion >= 0x02060000:
+                                        p.proc.terminate()
+                                else:
+                                        p.wait()
+                        else:
+                                p.wait()
         print "Test completed with error: " + errmsg
         sys.exit(1)