aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xpatchwork/bin/parsemail.py4
-rw-r--r--patchwork/tests/mail/0007-cvs-format-diff.mbox2
-rw-r--r--patchwork/tests/mail/0010-invalid-charset.mbox2
-rw-r--r--patchwork/tests/test_patchparser.py42
4 files changed, 31 insertions, 19 deletions
diff --git a/patchwork/bin/parsemail.py b/patchwork/bin/parsemail.py
index ed081b5..5c56007 100755
--- a/patchwork/bin/parsemail.py
+++ b/patchwork/bin/parsemail.py
@@ -195,9 +195,9 @@ def mail_headers(mail):
def find_pull_request(content):
git_re = re.compile(r'^The following changes since commit.*' +
- r'^are available in the git repository at:.*'+
+ r'^are available in the git repository at:.\n'
r'^\s*([\S]+://[^\n]+)[$]*',
- re.DOTALL | re.MULTILINE)
+ re.DOTALL | re.MULTILINE | re.IGNORECASE)
match = git_re.search(content)
if match:
return match.group(1)
diff --git a/patchwork/tests/mail/0007-cvs-format-diff.mbox b/patchwork/tests/mail/0007-cvs-format-diff.mbox
index 99735fa..10219df 100644
--- a/patchwork/tests/mail/0007-cvs-format-diff.mbox
+++ b/patchwork/tests/mail/0007-cvs-format-diff.mbox
@@ -18,7 +18,7 @@ To: binutils <binutils@sourceware.org>
CC: linux-mips <linux-mips@linux-mips.org>,
Manuel Lauss <manuel.lauss@googlemail.com>,
Debian MIPS <debian-mips@lists.debian.org>
-Subject: [Patch]: Fix ld pr11138 FAILures on mips*.
+Subject: [PATCH]: Fix ld pr11138 FAILures on mips*.
Content-Type: multipart/mixed;
boundary="------------080709040708040308010506"
X-OriginalArrivalTime: 06 Dec 2011 00:49:35.0825 (UTC) FILETIME=[ECF8DC10:01CCB3B0]
diff --git a/patchwork/tests/mail/0010-invalid-charset.mbox b/patchwork/tests/mail/0010-invalid-charset.mbox
index 10b369d..351c326 100644
--- a/patchwork/tests/mail/0010-invalid-charset.mbox
+++ b/patchwork/tests/mail/0010-invalid-charset.mbox
@@ -6,7 +6,7 @@ Sender: libc-alpha-owner@sourceware.org
Date: Wed, 4 Jun 2014 17:50:46 +0000
From: "Joseph S. Myers" <joseph@codesourcery.com>
To: <libc-alpha@sourceware.org>
-Subject: Fix pow overflow in non-default rounding modes (bug 16315)
+Subject: [PATCH] Fix pow overflow in non-default rounding modes (bug 16315)
Message-ID: <Pine.LNX.4.64.1406041749420.3719@digraph.polyomino.org.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed;
diff --git a/patchwork/tests/test_patchparser.py b/patchwork/tests/test_patchparser.py
index 1d4b7a0..18e4026 100644
--- a/patchwork/tests/test_patchparser.py
+++ b/patchwork/tests/test_patchparser.py
@@ -43,10 +43,11 @@ class InlinePatchTest(PatchTest):
patch_filename = '0001-add-line.patch'
test_comment = 'Test for inlined patch'
expected_filenames = ['meep.text']
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.orig_patch = read_patch(self.patch_filename)
- email = create_email(self.test_comment + '\n' + self.orig_patch)
+ email = create_email(self.test_comment + '\n' + self.orig_patch, subject=self.test_subject)
content = find_content(self.project, email)
self.patch = content.patch
self.comment = content.comment
@@ -72,10 +73,11 @@ class AttachmentPatchTest(InlinePatchTest):
patch_filename = '0001-add-line.patch'
test_comment = 'Test for attached patch'
content_subtype = 'x-patch'
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.orig_patch = read_patch(self.patch_filename)
- email = create_email(self.test_comment, multipart=True)
+ email = create_email(self.test_comment, multipart=True, subject=self.test_subject)
attachment = MIMEText(self.orig_patch, _subtype=self.content_subtype)
email.attach(attachment)
content = find_content(self.project, email)
@@ -91,11 +93,12 @@ class AttachmentXDiffPatchTest(AttachmentPatchTest):
class UTF8InlinePatchTest(InlinePatchTest):
patch_filename = '0002-utf-8.patch'
patch_encoding = 'utf-8'
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.orig_patch = read_patch(self.patch_filename, self.patch_encoding)
email = create_email(self.test_comment + '\n' + self.orig_patch,
- content_encoding=self.patch_encoding)
+ content_encoding=self.patch_encoding, subject=self.test_subject)
content = find_content(self.project, email)
self.patch = content.patch
self.comment = content.comment
@@ -105,10 +108,11 @@ class UTF8InlinePatchTest(InlinePatchTest):
class NoCharsetInlinePatchTest(InlinePatchTest):
""" Test mails with no content-type or content-encoding header """
patch_filename = '0001-add-line.patch'
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.orig_patch = read_patch(self.patch_filename)
- email = create_email(self.test_comment + '\n' + self.orig_patch)
+ email = create_email(self.test_comment + '\n' + self.orig_patch, subject=self.test_subject)
del email['Content-Type']
del email['Content-Transfer-Encoding']
content = find_content(self.project, email)
@@ -120,12 +124,13 @@ class NoCharsetInlinePatchTest(InlinePatchTest):
class SignatureCommentTest(InlinePatchTest):
patch_filename = '0001-add-line.patch'
test_comment = 'Test comment\nmore comment'
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.orig_patch = read_patch(self.patch_filename)
email = create_email(
self.test_comment + '\n' +
- '-- \nsig\n' + self.orig_patch)
+ '-- \nsig\n' + self.orig_patch, subject=self.test_subject)
content = find_content(self.project, email)
self.patch = content.patch
self.comment = content.comment
@@ -135,6 +140,7 @@ class SignatureCommentTest(InlinePatchTest):
class ListFooterTest(InlinePatchTest):
patch_filename = '0001-add-line.patch'
test_comment = 'Test comment\nmore comment'
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.orig_patch = read_patch(self.patch_filename)
@@ -142,7 +148,7 @@ class ListFooterTest(InlinePatchTest):
self.test_comment + '\n' +
'_______________________________________________\n' +
'Linuxppc-dev mailing list\n' +
- self.orig_patch)
+ self.orig_patch, subject=self.test_subject)
content = find_content(self.project, email)
self.patch = content.patch
self.comment = content.comment
@@ -214,8 +220,8 @@ class SenderUTF8B64EncodingTest(SenderUTF8QPEncodingTest):
class SubjectEncodingTest(PatchTest):
sender = 'example user <user@example.com>'
- subject = 'test subject'
- subject_header = 'test subject'
+ subject = '[PATCH] test subject'
+ subject_header = '[PATCH] test subject'
def setUp(self):
mail = 'Message-Id: %s\n' % make_msgid() + \
@@ -227,7 +233,9 @@ class SubjectEncodingTest(PatchTest):
def testSubjectEncoding(self):
content = find_content(self.project, self.email)
- self.assertEqual(content.patch.name, self.subject)
+ name_from_subject = content.patch.name in self.subject
+ self.assertTrue(name_from_subject)
+ #self.assertEqual(content.patch.name, self.subject)
class SubjectUTF8QPEncodingTest(SubjectEncodingTest):
@@ -291,6 +299,7 @@ class MultipleProjectPatchTest(TestCase):
test_comment = 'Test Comment'
patch_filename = '0001-add-line.patch'
msgid = '<1@example.com>'
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.p1 = Project(linkname='test-project-1', name='Project 1',
@@ -302,7 +311,7 @@ class MultipleProjectPatchTest(TestCase):
self.p2.save()
patch = read_patch(self.patch_filename)
- email = create_email(self.test_comment + '\n' + patch)
+ email = create_email(self.test_comment + '\n' + patch, subject=self.test_subject)
del email['Message-Id']
email['Message-Id'] = self.msgid
@@ -337,7 +346,7 @@ class MultipleProjectPatchCommentTest(MultipleProjectPatchTest):
for project in [self.p1, self.p2]:
email = MIMEText(self.comment_content)
email['From'] = defaults.sender
- email['Subject'] = defaults.subject
+ email['Subject'] = '[PATCH] Test Subject'
email['Message-Id'] = self.comment_msgid
email['List-ID'] = '<' + project.listid + '>'
email['In-Reply-To'] = self.msgid
@@ -616,6 +625,7 @@ class DelegateRequestTest(TestCase):
patch_filename = '0001-add-line.patch'
msgid = '<1@example.com>'
invalid_delegate_email = "nobody"
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
self.patch = read_patch(self.patch_filename)
@@ -625,7 +635,7 @@ class DelegateRequestTest(TestCase):
self.p1.save()
def get_email(self):
- email = create_email(self.patch)
+ email = create_email(self.patch, subject=self.test_subject)
del email['List-ID']
email['List-ID'] = '<' + self.p1.listid + '>'
email['Message-Id'] = self.msgid
@@ -662,14 +672,15 @@ class MailFromPatchTest(TestCase):
fixtures = ['default_states', 'default_events']
patch_filename = '0001-add-line.patch'
msgid = '<1@example.com>'
+ test_subject = '[PATCH] Test Subject'
def get_email(self, multipart=False):
if multipart:
- email = create_email('See attached patch!', multipart=multipart)
+ email = create_email('See attached patch!', multipart=multipart, subject=self.test_subject)
attachment = MIMEText(self.patch, _subtype='x-patch')
email.attach(attachment)
else:
- email = create_email(self.patch)
+ email = create_email(self.patch, subject=self.test_subject)
del email['List-ID']
email['List-ID'] = '<' + self.p1.listid + '>'
email['Message-Id'] = self.msgid
@@ -802,6 +813,7 @@ class ParseInitialTagsTest(PatchTest):
'Tested-by: Test User <test@example.com>\n' +
'Reviewed-by: Test User <test@example.com>\n')
fixtures = ['default_tags', 'default_states', 'default_events']
+ test_subject = '[PATCH] Test Subject'
def setUp(self):
project = defaults.project
@@ -809,7 +821,7 @@ class ParseInitialTagsTest(PatchTest):
project.save()
self.orig_patch = read_patch(self.patch_filename)
email = create_email(self.test_comment + '\n' + self.orig_patch,
- project=project)
+ project=project, subject=self.test_subject)
email['Message-Id'] = '<1@example.com>'
parse_mail(email)
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-06-07 10:20:07 +0000