Changeset ee3bccd

Timestamp:

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

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

b56c76c

Parents:

1146e21

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: make chdirs work more reliably between tests

File:

• protocols/skype/test.py (modified) (3 diffs)

protocols/skype/test.py

@@ -52 +52 @@
                 cwd = os.getcwd()
                 os.chdir("t/skyped")
-                shutil.copyfile("../../skyped.cnf", "skyped.cnf")
-                self.openssl(['req', '-new', '-x509', '-days', '365', '-nodes', '-config', 'skyped.cnf', '-out', 'skyped.cert.pem', '-keyout', 'skyped.key.pem'])
-                with open("skyped.conf", "w") as sock:
-                        sock.write("[skyped]\n")
-                        sock.write("username = alice\n")
-                        sock.write("password = %s\n" % hashlib.sha1("foo").hexdigest())
-                        sock.write("cert = %s/skyped.cert.pem\n" % os.getcwd())
-                        sock.write("key = %s/skyped.key.pem\n" % os.getcwd())
-                        sock.write("port = 2727\n")
-                os.chdir(cwd)
+                try:
+                        shutil.copyfile("../../skyped.cnf", "skyped.cnf")
+                        self.openssl(['req', '-new', '-x509', '-days', '365', '-nodes', '-config', 'skyped.cnf', '-out', 'skyped.cert.pem', '-keyout', 'skyped.key.pem'])
+                        with open("skyped.conf", "w") as sock:
+                                sock.write("[skyped]\n")
+                                sock.write("username = alice\n")
+                                sock.write("password = %s\n" % hashlib.sha1("foo").hexdigest())
+                                sock.write("cert = %s/skyped.cert.pem\n" % os.getcwd())
+                                sock.write("key = %s/skyped.key.pem\n" % os.getcwd())
+                                sock.write("port = 2727\n")
+                finally:
+                        os.chdir(cwd)
 
 
@@ -72 +74 @@
         def testInfo(self):
                 self.mock("info")
-        
+
         def testCall(self):
                 self.mock("call")
-        
+
         def testCallFailed(self):
                 self.mock("call-failed")
-        
+
         def testAddYes(self):
                 self.mock("add-yes")
@@ -90 +92 @@
         def testGroupchatInvite(self):
                 self.mock("groupchat-invite")
-        
+
         def testCalledYes(self):
                 self.mock("called-yes")