zuul
/
zuul
Code Issues Proposed changes

Merge "Make smtp tests more robust"

This commit is contained in:
James E. Blair 2014-01-08 07:44:22 +00:00 committed by Gerrit Code Review
parent 25bda60aa4 ff80a2f003
commit 1c67a05a3c
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/test_scheduler.py
View File

@ -690,11 +690,11 @@ class FakeGearmanServer(gear.Server):
class FakeSMTP(object): class FakeSMTP(object):
log = logging.getLogger('zuul.FakeSMTP') log = logging.getLogger('zuul.FakeSMTP')
messages = []
def __init__(self, server, port): def __init__(self, messages, server, port):
self.server = server self.server = server
self.port = port self.port = port
self.messages = messages
def sendmail(self, from_email, to_email, msg): def sendmail(self, from_email, to_email, msg):
self.log.info("Sending email from %s, to %s, with msg %s" % ( self.log.info("Sending email from %s, to %s, with msg %s" % (
@ -703,7 +703,7 @@ class FakeSMTP(object):
headers = msg.split('\n\n', 1)[0] headers = msg.split('\n\n', 1)[0]
body = msg.split('\n\n', 1)[1] body = msg.split('\n\n', 1)[1]
FakeSMTP.messages.append(dict( self.messages.append(dict(
from_email=from_email, from_email=from_email,
to_email=to_email, to_email=to_email,
msg=msg, msg=msg,
@ -729,7 +729,7 @@ class TestScheduler(testtools.TestCase):
# If timeout value is invalid do not set a timeout. # If timeout value is invalid do not set a timeout.
test_timeout = 0 test_timeout = 0
if test_timeout > 0: if test_timeout > 0:
self.useFixture(fixtures.Timeout(test_timeout, gentle=True)) self.useFixture(fixtures.Timeout(test_timeout, gentle=False))
if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or
os.environ.get('OS_STDOUT_CAPTURE') == '1'): os.environ.get('OS_STDOUT_CAPTURE') == '1'):
@ -800,8 +800,14 @@ class TestScheduler(testtools.TestCase):
urllib2.urlopen = URLOpenerFactory urllib2.urlopen = URLOpenerFactory
self.launcher = zuul.launcher.gearman.Gearman(self.config, self.sched) self.launcher = zuul.launcher.gearman.Gearman(self.config, self.sched)
self.smtp_messages = []
def FakeSMTPFactory(*args, **kw):
args = [self.smtp_messages] + list(args)
return FakeSMTP(*args, **kw)
zuul.lib.gerrit.Gerrit = FakeGerrit zuul.lib.gerrit.Gerrit = FakeGerrit
self.useFixture(fixtures.MonkeyPatch('smtplib.SMTP', FakeSMTP)) self.useFixture(fixtures.MonkeyPatch('smtplib.SMTP', FakeSMTPFactory))
self.gerrit = FakeGerritTrigger( self.gerrit = FakeGerritTrigger(
self.upstream_root, self.config, self.sched) self.upstream_root, self.config, self.sched)
@ -2972,25 +2978,25 @@ class TestScheduler(testtools.TestCase):
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
self.waitUntilSettled() self.waitUntilSettled()
self.assertEqual(len(FakeSMTP.messages), 2) self.assertEqual(len(self.smtp_messages), 2)
# A.messages only holds what FakeGerrit places in it. Thus we # A.messages only holds what FakeGerrit places in it. Thus we
# work on the knowledge of what the first message should be as # work on the knowledge of what the first message should be as
# it is only configured to go to SMTP. # it is only configured to go to SMTP.
self.assertEqual('zuul@example.com', self.assertEqual('zuul@example.com',
FakeSMTP.messages[0]['from_email']) self.smtp_messages[0]['from_email'])
self.assertEqual(['you@example.com'], self.assertEqual(['you@example.com'],
FakeSMTP.messages[0]['to_email']) self.smtp_messages[0]['to_email'])
self.assertEqual('Starting check jobs.', self.assertEqual('Starting check jobs.',
FakeSMTP.messages[0]['body']) self.smtp_messages[0]['body'])
self.assertEqual('zuul_from@example.com', self.assertEqual('zuul_from@example.com',
FakeSMTP.messages[1]['from_email']) self.smtp_messages[1]['from_email'])
self.assertEqual(['alternative_me@example.com'], self.assertEqual(['alternative_me@example.com'],
FakeSMTP.messages[1]['to_email']) self.smtp_messages[1]['to_email'])
self.assertEqual(A.messages[0], self.assertEqual(A.messages[0],
FakeSMTP.messages[1]['body']) self.smtp_messages[1]['body'])
def test_timer_smtp(self): def test_timer_smtp(self):
"Test that a periodic job is triggered" "Test that a periodic job is triggered"
@ -3018,18 +3024,18 @@ class TestScheduler(testtools.TestCase):
self.assertEqual(self.getJobFromHistory( self.assertEqual(self.getJobFromHistory(
'project-bitrot-stable-older').result, 'SUCCESS') 'project-bitrot-stable-older').result, 'SUCCESS')
self.assertEqual(len(FakeSMTP.messages), 1) self.assertEqual(len(self.smtp_messages), 1)
# A.messages only holds what FakeGerrit places in it. Thus we # A.messages only holds what FakeGerrit places in it. Thus we
# work on the knowledge of what the first message should be as # work on the knowledge of what the first message should be as
# it is only configured to go to SMTP. # it is only configured to go to SMTP.
self.assertEqual('zuul_from@example.com', self.assertEqual('zuul_from@example.com',
FakeSMTP.messages[0]['from_email']) self.smtp_messages[0]['from_email'])
self.assertEqual(['alternative_me@example.com'], self.assertEqual(['alternative_me@example.com'],
FakeSMTP.messages[0]['to_email']) self.smtp_messages[0]['to_email'])
self.assertIn('Subject: Periodic check for org/project succeeded', self.assertIn('Subject: Periodic check for org/project succeeded',
FakeSMTP.messages[0]['headers']) self.smtp_messages[0]['headers'])
def test_client_enqueue(self): def test_client_enqueue(self):
"Test that the RPC client can enqueue a change" "Test that the RPC client can enqueue a change"