Changeset 1146e21

Timestamp:

2013-02-11T12:56:03Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

ee3bccd

Parents:

65a5d15

git-author:

Mike Kazantsev <mk.fraggod@…> (11-02-13 12:56:03)

git-committer:

Miklos Vajna <vmiklos@…> (11-02-13 12:56:03)

Message:

skype.test: do proper cleanup of skyped process despite possible exceptions, keep pexpect.log

File:

• protocols/skype/test.py (modified) (1 diff)

protocols/skype/test.py

@@ -18 +18 @@
                         proc.communicate()
         def mock(self, name):
-                skyped_log = open("t/skyped.log", "w")
-                skyped = subprocess.Popen([sys.executable, "skyped.py", "-c", "t/skyped/skyped.conf", "-n", "-d", "-m", "t/%s-skyped.mock" % name],
+                with open("t/skyped.log", "w") as skyped_log,\
+                                open("t/pexpect.log", "w") as pexpect_log:
+                        skyped = subprocess.Popen([sys.executable, "skyped.py",
+                                "-c", "t/skyped/skyped.conf", "-n", "-d", "-m", "t/%s-skyped.mock" % name],
                                 stdout=skyped_log, stderr=subprocess.STDOUT)
-
-                try:
-                        bitlbee = pexpect.spawn('../../bitlbee', ['-d', 't/bitlbee'])
-                        bitlbee_mock = open("t/%s-bitlbee.mock" % name)
-                        for i in bitlbee_mock.readlines():
-                                line = i.strip()
-                                if line.startswith(">> "):
-                                        bitlbee.expect_exact(line[3:], timeout=10)
-                                elif line.startswith("<< "):
-                                        bitlbee.sendline(line[3:])
-                        bitlbee_mock.close()
-                        bitlbee.close()
-                finally:
-                        skyped.terminate()
-                        skyped.communicate()
-                        skyped_log.close()
+                        try:
+                                bitlbee = pexpect.spawn('../../bitlbee', ['-d', 't/bitlbee'], logfile=pexpect_log)
+                                bitlbee_mock = open("t/%s-bitlbee.mock" % name)
+                                for i in bitlbee_mock.readlines():
+                                        line = i.strip()
+                                        if line.startswith(">> "):
+                                                bitlbee.expect_exact(line[3:], timeout=10)
+                                        elif line.startswith("<< "):
+                                                bitlbee.sendline(line[3:])
+                                bitlbee_mock.close()
+                                bitlbee.close()
+                        finally:
+                                skyped.terminate()
+                                skyped.communicate()
 
         def setUp(self):