holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-25 01:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

PEP-8 fixes

Browse Source
This commit is contained in:
Garret Wassermann 2017-04-20 02:44:12 -04:00
parent bf344b09b1
commit 47f3eb8e89
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpdesk/management/commands/get_email.py
View File

@ -387,7 +387,7 @@ def ticket_from_message(message, queue, logger):
all_users = User.objects.all()
all_user_emails = set([x.email for x in all_users])
users_not_currently_ccd = all_user_emails.difference(set(current_cc))
users_to_cc = cc.intersection( users_not_currently_ccd )
users_to_cc = cc.intersection(users_not_currently_ccd)
for user in users_to_cc:
tcc = TicketCC.objects.create(
ticket=t,

20
helpdesk/tests/test_get_email.py
View File

@ -355,6 +355,7 @@ class GetEmailParametricTemplate(object):
self.assertEqual(attach2.followup.id, 2)
self.assertEqual(attach2.filename, 'email_html_body.html')
class GetEmailCCHandling(TestCase):
"""TestCase that checks CC handling in email. Needs its own test harness."""
@ -422,7 +423,6 @@ class GetEmailCCHandling(TestCase):
}
self.original_cc = TicketCC.objects.create(**cc_kwargs)
def tearDown(self):
rmtree(self.temp_logdir)
@ -457,15 +457,16 @@ class GetEmailCCHandling(TestCase):
test_mail_len = len(test_email)
with mock.patch('helpdesk.management.commands.get_email.listdir') as mocked_listdir, \
mock.patch('helpdesk.management.commands.get_email.isfile') as mocked_isfile, \
mock.patch('builtins.open' if six.PY3 else '__builtin__.open', mock.mock_open(read_data=test_email)):
mocked_isfile.return_value = True
mocked_listdir.return_value = ['filename1']
mock.patch('helpdesk.management.commands.get_email.isfile') as mocked_isfile, \
mock.patch('builtins.open' if six.PY3 else '__builtin__.open', mock.mock_open(read_data=test_email)):
call_command('get_email')
mocked_isfile.return_value = True
mocked_listdir.return_value = ['filename1']
mocked_listdir.assert_called_with('/var/lib/mail/helpdesk/')
mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename1')
call_command('get_email')
mocked_listdir.assert_called_with('/var/lib/mail/helpdesk/')
mocked_isfile.assert_any_call('/var/lib/mail/helpdesk/filename1')
# ensure these 4 CCs (test_email_cc one thru four) are the only ones
# created and added to the existing staff_user that was CC'd,
@ -508,6 +509,5 @@ for method, socks in case_matrix:
cl = type(test_name,
(GetEmailParametricTemplate,TestCase,),
{ "method": method, "socks": socks}
)
{"method": method, "socks": socks})
setattr(thismodule, test_name, cl)