Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-10-31 08:34:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop writing "1 days" in emails.

Browse Source
This commit is contained in:
Robert Bruce Park 2017-03-13 10:26:59 -07:00
parent 1b4828bfb3
commit 0579677457
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
britney2/policies/email.py
View File

@ -31,7 +31,7 @@ Hi,
{source_name} {version} needs attention.
It has been stuck in {series}-proposed for {age:.0f} day{plural}.
It has been stuck in {series}-proposed for {age} day{plural}.
You either sponsored or uploaded this package, please investigate why it hasn't been approved for migration.
@ -160,6 +160,7 @@ class EmailPolicy(BasePolicy, Rest):
sent = self.cache.get(source_name, {}).get(version, False)
age = excuse.daysold or 0
stuck = age >= max_age
age = int(age)
plural = 's' if age != 1 else ''
if self.dry_run:
self.log("[email dry run] Considering: %s/%s: %s" %

19
tests/test_email.py
View File

@ -216,6 +216,25 @@ class T(unittest.TestCase):
e.apply_policy_impl(None, None, 'chromium-browser', None, FakeSourceData, FakeExcuse)
smtp.SMTP.assert_called_once_with('localhost')
@patch('britney2.policies.email.EmailPolicy.lp_get_emails')
@patch('britney2.policies.email.smtplib', autospec=True)
def test_smtp_days(self, smtp, lp):
"""Pluralize correctly."""
lp.return_value = ['email@address.com']
e = EmailPolicy(FakeOptions, None)
FakeExcuse.is_valid = False
FakeExcuse.daysold = 1.01
e.apply_policy_impl(None, None, 'chromium-browser', None, FakeSourceData, FakeExcuse)
smtp.SMTP.assert_called_once_with('localhost')
name, args, kwargs = smtp.SMTP().sendmail.mock_calls[0]
text = args[2]
self.assertIn(' 1 day.', text)
FakeExcuse.daysold = 4.9
e.apply_policy_impl(None, None, 'chromium-browser', None, FakeSourceData, FakeExcuse)
name, args, kwargs = smtp.SMTP().sendmail.mock_calls[-1]
text = args[2]
self.assertIn(' 4 days.', text)
if __name__ == '__main__':
unittest.main()