[tor-commits] [bridgedb/develop] Move tests for getGPGContext() into the test_crypto unittest file.
isis at torproject.org
isis at torproject.org
Wed May 14 03:42:27 UTC 2014
commit 3c1ec086c1148eed86d393ba7c2702841dd1bee6
Author: Isis Lovecruft <isis at torproject.org>
Date: Mon May 5 20:32:34 2014 +0000
Move tests for getGPGContext() into the test_crypto unittest file.
---
lib/bridgedb/test/test_crypto.py | 68 +++++++++++++++++++
lib/bridgedb/test/test_email_server.py | 112 ++++++++------------------------
2 files changed, 96 insertions(+), 84 deletions(-)
diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py
index 5d69a55..238002d 100644
--- a/lib/bridgedb/test/test_crypto.py
+++ b/lib/bridgedb/test/test_crypto.py
@@ -16,6 +16,7 @@ from __future__ import unicode_literals
import logging
import os
+import shutil
import OpenSSL
@@ -26,6 +27,8 @@ from twisted.web.test import test_agent as txtagent
from bridgedb import crypto
from bridgedb import txrecaptcha
+from bridgedb.persistent import Conf
+from bridgedb.test.util import fileCheckDecorator
logging.disable(50)
@@ -160,3 +163,68 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase,
contextFactory = crypto.SSLVerifyingContextFactory(self.url)
self.assertIsInstance(contextFactory.getContext(),
OpenSSL.SSL.Context)
+
+
+class GetGPGContextTest(unittest.TestCase):
+ """Unittests for :func:`bridgedb.crypto.getGPGContext`."""
+
+ timeout = 15
+
+ @fileCheckDecorator
+ def doCopyFile(self, src, dst, description=None):
+ shutil.copy(src, dst)
+
+ def removeRundir(self):
+ if os.path.isdir(self.runDir):
+ shutil.rmtree(self.runDir)
+
+ def makeBadKey(self):
+ self.setKey(self.badKeyfile)
+
+ def setKey(self, keyfile=''):
+ setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile)
+
+ def setUp(self):
+ here = os.getcwd()
+ topDir = here.rstrip('_trial_temp')
+ self.runDir = os.path.join(here, 'rundir')
+ self.gpgMoved = os.path.join(self.runDir, 'TESTING.subkeys.sec')
+ self.gpgFile = os.path.join(topDir, 'gnupghome',
+ 'TESTING.subkeys.sec')
+
+ if not os.path.isdir(self.runDir):
+ os.makedirs(self.runDir)
+
+ self.badKeyfile = os.path.join(here, 'badkey.asc')
+ with open(self.badKeyfile, 'w') as badkey:
+ badkey.write('NO PASARAN, DEATH CAKES!')
+ badkey.flush()
+
+ self.doCopyFile(self.gpgFile, self.gpgMoved, "GnuPG test keyfile")
+
+ self.config = Conf()
+ setattr(self.config, 'EMAIL_GPG_SIGNING_ENABLED', True)
+ setattr(self.config, 'EMAIL_GPG_SIGNING_KEY',
+ 'gnupghome/TESTING.subkeys.sec')
+
+ self.addCleanup(self.removeRundir)
+
+ def test_getGPGContext_good_keyfile(self):
+ """Test EmailServer.getGPGContext() with a good key filename."""
+ self.skip = True
+ raise unittest.SkipTest("see ticket #5264")
+
+ ctx = crypto.getGPGContext(self.config)
+ self.assertIsInstance(ctx, crypto.gpgme.Context)
+
+ def test_getGPGContext_missing_keyfile(self):
+ """Test EmailServer.getGPGContext() with a missing key filename."""
+ self.setKey('missing-keyfile.asc')
+ ctx = crypto.getGPGContext(self.config)
+ self.assertTrue(ctx is None)
+
+ def test_getGPGContext_bad_keyfile(self):
+ """Test EmailServer.getGPGContext() with a missing key filename."""
+ self.makeBadKey()
+ ctx = crypto.getGPGContext(self.config)
+ self.assertTrue(ctx is None)
diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py
index e925f07..f980d83 100644
--- a/lib/bridgedb/test/test_email_server.py
+++ b/lib/bridgedb/test/test_email_server.py
@@ -13,15 +13,14 @@
from __future__ import print_function
-import os
-import shutil
-
import io
import copy
+import os
+import shutil
+import types
from bridgedb.Dist import EmailBasedDistributor
from bridgedb.email import server
-from bridgedb.email.server import MailContext
from bridgedb.Time import NoSchedule
from bridgedb.parse.addr import BadEmail
from bridgedb.persistent import Conf
@@ -57,20 +56,25 @@ EMAIL_BIND_IP = "127.0.0.1"
EMAIL_PORT = 5225
"""))
-def _createMailContext(distributor=None):
+def _createConfig(configFile=TEST_CONFIG_FILE):
configuration = {}
TEST_CONFIG_FILE.seek(0)
- compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec')
+ compiled = compile(configFile.read(), '<string>', 'exec')
exec compiled in configuration
config = Conf(**configuration)
+ return config
+
+def _createMailContext(config=None, distributor=None):
+ if not config:
+ config = _createConfig()
if not distributor:
distributor = DummyEmailDistributor(
domainmap=config.EMAIL_DOMAIN_MAP,
domainrules=config.EMAIL_DOMAIN_RULES)
- ctx = MailContext(config, distributor, NoSchedule())
- return ctx
+ context = server.MailContext(config, distributor, NoSchedule())
+ return context
class DummyEmailDistributor(object):
@@ -92,85 +96,27 @@ class DummyEmailDistributor(object):
countryCode=None, bridgeFilterRules=None):
return [DummyBridge() for _ in xrange(N)]
+ def cleanDatabase(self):
+ pass
-class EmailGnuPGTest(unittest.TestCase):
- """Tests for :func:`bridgedb.EmailServer.getGPGContext`."""
-
- timeout = 15
- @fileCheckDecorator
- def doCopyFile(self, src, dst, description=None):
- shutil.copy(src, dst)
+class CreateResponseBodyTests(unittest.TestCase):
+ """Tests for :func:`bridgedb.email.server.createResponseBody`."""
- def removeRundir(self):
- if os.path.isdir(self.runDir):
- shutil.rmtree(self.runDir)
-
- def makeBadKey(self):
- keyfile = os.path.join(self.runDir, 'badkey.asc')
- with open(keyfile, 'wb') as badkey:
- badkey.write('NO PASARÃN, DEATH CAKES!')
- badkey.flush()
- self.setKey(keyfile)
-
- def setKey(self, keyfile=''):
- setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile)
-
- def setUp(self):
+ def _moveGPGTestKeyfile(self):
here = os.getcwd()
topDir = here.rstrip('_trial_temp')
- self.runDir = os.path.join(here, 'rundir')
self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec')
self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec')
-
- if not os.path.isdir(self.runDir):
- os.makedirs(self.runDir)
-
- configuration = {}
- TEST_CONFIG_FILE.seek(0)
- compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec')
- exec compiled in configuration
- self.config = Conf(**configuration)
-
- self.addCleanup(self.removeRundir)
-
- def test_getGPGContext_good_keyfile(self):
- """Test EmailServer.getGPGContext() with a good key filename.
-
- XXX: See #5463.
- """
- raise unittest.SkipTest(
- "See #5463 for why this test fails when it should pass")
-
- self.doCopyFile(self.gpgFile, self.gpgMoved, "GnuPG test keyfile")
- ctx = EmailServer.getGPGContext(self.config)
- self.assertIsInstance(ctx, EmailServer.gpgme.Context)
-
- def test_getGPGContext_missing_keyfile(self):
- """Test EmailServer.getGPGContext() with a missing key filename."""
- self.setKey('missing-keyfile.asc')
- ctx = EmailServer.getGPGContext(self.config)
- self.assertTrue(ctx is None)
-
- def test_getGPGContext_bad_keyfile(self):
- """Test EmailServer.getGPGContext() with a missing key filename."""
- self.makeBadKey()
- ctx = EmailServer.getGPGContext(self.config)
- self.assertTrue(ctx is None)
-
-
-class EmailResponseTests(unittest.TestCase):
- """Tests for :func:`bridgedb.EmailServer.getMailResponse`."""
+ shutil.copy(self.gpgFile, self.gpgMoved)
def setUp(self):
"""Create fake email, distributor, and associated context data."""
- # TODO: Add headers if we start validating them
- self.lines = ["From: %s@%s.com",
- "To: bridges at localhost",
- "Subject: testing",
- "",
- "get bridges"]
- self.ctx = _createMailContext()
+ self._moveGPGTestKeyfile()
+ self.toAddress = "user at example.com"
+ self.config = _createConfig()
+ self.ctx = _createMailContext(self.config)
+ self.distributor = self.ctx.distributor
def _isTwoTupleOfNone(self, reply):
"""Check that a return value is ``(None, None)``."""
@@ -328,14 +274,12 @@ class EmailReplyTests(unittest.TestCase):
class EmailServerServiceTests(unittest.TestCase):
def setUp(self):
- # TODO: Add headers if we start validating them
- self.lines = ["From: %s@%s.com", "To: %s at example.net",
- "Subject: testing", "\n", "get bridges"]
- self.distributor = DummyEmailDistributor('key', {}, {}, [])
- self.ctx = _createMailContext(self.distributor)
+ self.config = _createConfig()
+ self.context = _createMailContext(self.config)
+ self.distributor = self.context.distributor
- def test_receiveMail(self):
+ def test_addServer(self):
self.skip = True
raise unittest.SkipTest("Not finished yet")
from twisted.internet import reactor
- EmailServer.addSMTPServer(self.ctx.cfg, self.distributor, NoSchedule)
+ server.addServer(self.config, self.distributor, NoSchedule)
More information about the tor-commits
mailing list