[tor-commits] [bridgedb/develop] Implement skipped unittests for bridgedb.email.server.addServer().

[isis at torproject.org]

commit 705633e1774ad54214592101d7ed1226115b5ff6
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue May 20 20:12:23 2014 +0000

    Implement skipped unittests for bridgedb.email.server.addServer().
---
 lib/bridgedb/test/test_email_server.py |   41 +++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py
index 30d27f1..717a006 100644
--- a/lib/bridgedb/test/test_email_server.py
+++ b/lib/bridgedb/test/test_email_server.py
@@ -529,14 +529,43 @@ class SMTPTestCaseMixin(TestCaseMixin):
         self.assertSubstring(expected, recv)
 
 
-class EmailServerServiceTests(unittest.TestCase):
+class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase):
+    """Unittests for :func:`bridgedb.email.server.addServer`."""
+
     def setUp(self):
+        """Create a server.MailContext and EmailBasedDistributor."""
         self.config = _createConfig()
         self.context = _createMailContext(self.config)
-        self.distributor = self.context.distributor
+        self.smtpFromAddr = self.context.smtpFromAddr  # 'bridges at localhost'
+        self.sched = Unscheduled()
+        self.dist = self.context.distributor
+
+    def tearDown(self):
+        """Kill all connections with fire."""
+        if self.transport:
+            self.transport.loseConnection()
+        super(EmailServerServiceTests, self).tearDown()
+        # FIXME: this is definitely not how we're supposed to do this, but it
+        # kills the DirtyReactorAggregateErrors.
+        reactor.disconnectAll()
+        reactor.runUntilCurrent()
 
     def test_addServer(self):
-        self.skip = True
-        raise unittest.SkipTest("Not finished yet")
-        from twisted.internet import reactor
-        server.addServer(self.config, self.distributor, Unscheduled)
+        """Call :func:`bridgedb.email.server.addServer` to test startup."""
+        factory = server.addServer(self.config, self.dist, self.sched)
+        factory.timeout = None
+        factory.protocol.timeout = None  # Or else the reactor gets dirty
+
+        self.proto = factory.buildProtocol(('127.0.0.1', 0))
+        self.proto.setTimeout(None)
+        # Set the transport's protocol, because
+        # StringTransportWithDisconnection is a bit janky:
+        self.transport.protocol = self.proto
+        self.proto.makeConnection(self.transport)
+
+        self._test(['HELO localhost',
+                    'MAIL FROM: testing at localhost',
+                    'RCPT TO: %s' % self.smtpFromAddr,
+                    "DATA", self._buildEmail(body="get transport obfs3")],
+                   "250 Delivery in progress",
+                   noisy=True)