X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Ftests%2Futils.py;h=782ed369cca0254a80d20abd5a90b7a70c3f614d;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hp=7166ed27ccdc0fdb7bdb11fce584fab3e2f0c05d;hpb=6c119273e873bc2c63ac470e7b975a721b9a6826;p=patchwork

diff --git a/apps/patchwork/tests/utils.py b/apps/patchwork/tests/utils.py
index 7166ed2..782ed36 100644
--- a/apps/patchwork/tests/utils.py
+++ b/apps/patchwork/tests/utils.py
@@ -19,9 +19,11 @@
 
 import os
 import codecs
-from patchwork.models import Project, Person, UserProfile
+from patchwork.models import Project, Person
 from django.contrib.auth.models import User
+from django.forms.fields import EmailField
 
+from email import message_from_file
 try:
     from email.mime.text import MIMEText
     from email.mime.multipart import MIMEMultipart
@@ -31,15 +33,16 @@ except ImportError:
     from email.MIMEMultipart import MIMEMultipart
 
 # helper functions for tests
-_test_mail_dir  = 'patchwork/tests/mail'
-_test_patch_dir = 'patchwork/tests/patches'
+_test_mail_dir  = os.path.join(os.path.dirname(__file__), 'mail')
+_test_patch_dir = os.path.join(os.path.dirname(__file__), 'patches')
 
 class defaults(object):
-    project = Project(linkname = 'test-project', name = 'Test Project')
+    project = Project(linkname = 'test-project', name = 'Test Project',
+                      listid = 'test.example.com')
 
     patch_author = 'Patch Author <patch-author@example.com>'
     patch_author_person = Person(name = 'Patch Author',
-				 email = 'patch-author@example.com')
+        email = 'patch-author@example.com')
 
     comment_author = 'Comment Author <comment-author@example.com>'
 
@@ -49,21 +52,38 @@ class defaults(object):
 
     patch_name = 'Test Patch'
 
+    patch = """--- /dev/null	2011-01-01 00:00:00.000000000 +0800
++++ a	2011-01-01 00:00:00.000000000 +0800
+@@ -0,0 +1 @@
++a
+"""
+
+error_strings = {
+    'email': 'Enter a valid email address.',
+}
+
 _user_idx = 1
 def create_user():
     global _user_idx
-    userid = 'test-%d' % _user_idx
+    userid = 'test%d' % _user_idx
     email = '%s@example.com' % userid
     _user_idx += 1
 
     user = User.objects.create_user(userid, email, userid)
     user.save()
 
-    profile = UserProfile(user = user)
-    profile.save()
+    person = Person(email = email, name = userid, user = user)
+    person.save()
 
     return user
 
+def create_maintainer(project):
+    user = create_user()
+    profile = user.profile
+    profile.maintainer_projects.add(project)
+    profile.save()
+    return user
+
 def find_in_context(context, key):
     if isinstance(context, list):
         for c in context:
@@ -78,12 +98,19 @@ def find_in_context(context, key):
 def read_patch(filename, encoding = None):
     file_path = os.path.join(_test_patch_dir, filename)
     if encoding is not None:
-	f = codecs.open(file_path, encoding = encoding)
+        f = codecs.open(file_path, encoding = encoding)
     else:
         f = file(file_path)
 
     return f.read()
 
+def read_mail(filename, project = None):
+    file_path = os.path.join(_test_mail_dir, filename)
+    mail = message_from_file(open(file_path))
+    if project is not None:
+        mail['List-Id'] = project.listid
+    return mail
+
 def create_email(content, subject = None, sender = None, multipart = False,
         project = None, content_encoding = None):
     if subject is None:
@@ -92,21 +119,20 @@ def create_email(content, subject = None, sender = None, multipart = False,
         sender = defaults.sender
     if project is None:
         project = defaults.project
+    if content_encoding is None:
+        content_encoding = 'us-ascii'
 
     if multipart:
         msg = MIMEMultipart()
-        body = MIMEText(content, _subtype = 'plain')
-        if content_encoding is not None:
-            body.set_charset(content_encoding)
+        body = MIMEText(content, _subtype = 'plain',
+                        _charset = content_encoding)
         msg.attach(body)
     else:
-        msg = MIMEText(content)
-        if content_encoding is not None:
-            msg.set_charset(content_encoding)
+        msg = MIMEText(content, _charset = content_encoding)
 
     msg['Subject'] = subject
     msg['From'] = sender
-    msg['List-Id'] = project.linkname
+    msg['List-Id'] = project.listid
 
 
     return msg