Changeset 94d9511

Timestamp:

2013-02-17T19:51:11Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

9754c2f

Parents:

130f7b8

Message:

skype tests: run all tests with a single skyped config

This makes them a bit faster, and there is no need to have separate
skyped configs for each test ATM.

File:

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

protocols/skype/test.py

@@ -9 +9 @@
 import hashlib
 
+def openssl(args):
+        with open(os.devnull, "w") as devnull:
+                proc = subprocess.Popen(['openssl'] + args, stdin=subprocess.PIPE, stderr=devnull)
+                for i in range(6):
+                        proc.stdin.write("\n")
+                proc.stdin.close()
+                proc.communicate()
+def setupSkyped():
+        try:
+                shutil.rmtree("t/skyped")
+        except OSError:
+                pass
+        os.makedirs("t/skyped")
+        cwd = os.getcwd()
+        os.chdir("t/skyped")
+        try:
+                shutil.copyfile("../../skyped.cnf", "skyped.cnf")
+                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)
+
 class Test(unittest.TestCase):
-        def openssl(self, args):
-                with open(os.devnull, "w") as devnull:
-                        proc = subprocess.Popen(['openssl'] + args, stdin=subprocess.PIPE, stderr=devnull)
-                        for i in range(6):
-                                proc.stdin.write("\n")
-                        proc.stdin.close()
-                        proc.communicate()
         def mock(self, name):
                 with open("t/skyped.log", "w") as skyped_log,\
@@ -58 +79 @@
                         pass
                 os.makedirs("t/bitlbee")
-
-                try:
-                        shutil.rmtree("t/skyped")
-                except OSError:
-                        pass
-                os.makedirs("t/skyped")
-                cwd = os.getcwd()
-                os.chdir("t/skyped")
-                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)
-
 
         def testMsg(self):
@@ -129 +129 @@
 
 if __name__ == '__main__':
+        setupSkyped()
         unittest.main()