]> git.ozlabs.org Git - patchwork/commitdiff
tests: add abstract mbox parsing test
authorJeremy Kerr <jk@ozlabs.org>
Thu, 8 Dec 2011 14:00:43 +0000 (22:00 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Thu, 8 Dec 2011 14:09:00 +0000 (22:09 +0800)
Add a new class to handle mbox-parsing code, abstracting what is done by
the current git-pull tests.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
apps/patchwork/tests/patchparser.py

index 5c8c41208f837f096661ef8b07a170a5a6177d81..296da5ffe8147c53388d25bc177ced80b19a68f2 100644 (file)
@@ -346,13 +346,15 @@ class ListIdHeaderTest(unittest.TestCase):
     def tearDown(self):
         self.project.delete()
 
+class MBoxPatchTest(PatchTest):
+    def setUp(self):
+        self.mail = read_mail(self.mail_file, project = self.project)
 
-class GitPullTest(PatchTest):
+class GitPullTest(MBoxPatchTest):
     mail_file = '0001-git-pull-request.mbox'
 
     def testGitPullRequest(self):
-        mail = read_mail(self.mail_file, project = self.project)
-        (patch, comment) = find_content(self.project, mail)
+        (patch, comment) = find_content(self.project, self.mail)
         self.assertTrue(patch is not None)
         self.assertTrue(patch.pull_url is not None)
         self.assertTrue(patch.content is None)
@@ -361,11 +363,11 @@ class GitPullTest(PatchTest):
 class GitPullWrappedTest(GitPullTest):
     mail_file = '0002-git-pull-request-wrapped.mbox'
 
-class GitPullWithDiffTest(PatchTest):
+class GitPullWithDiffTest(MBoxPatchTest):
+    mail_file = '0003-git-pull-request-with-diff.mbox'
+
     def testGitPullWithDiff(self):
-        mail = read_mail('0003-git-pull-request-with-diff.mbox',
-                        project = self.project)
-        (patch, comment) = find_content(self.project, mail)
+        (patch, comment) = find_content(self.project, self.mail)
         self.assertTrue(patch is not None)
         self.assertEqual('git://git.kernel.org/pub/scm/linux/kernel/git/tip/' +
              'linux-2.6-tip.git x86-fixes-for-linus', patch.pull_url)