commit 28069af03162e36ee19483f46d9101656de16987 Author: Isis Lovecruft isis@torproject.org Date: Tue May 20 21:04:47 2014 +0000

Fix CI error on EmailServerServiceTests.test_addServer().

The SMTP MAIL FROM email address was unacceptable, because on TravisCI it ended up being `localhost@localhost.localdomain`. [0]

[0]: https://travis-ci.org/isislovecruft/bridgedb/builds/25636170#L1732 --- lib/bridgedb/test/test_email_server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index 5f92353..ebb9b85 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -683,8 +683,9 @@ class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): self.transport.protocol = self.proto self.proto.makeConnection(self.transport)

- self._test(['HELO localhost', - 'MAIL FROM: testing@localhost', + serverHost = socket.gethostname() + self._test(['HELO %s' % serverHost, + 'MAIL FROM: testing@%s' % serverHost, 'RCPT TO: %s' % self.smtpFromAddr, "DATA", self._buildEmail(body="get transport obfs3")], "250 Delivery in progress",