From c90fd3ff4da6df57275e0178fb97feee6f809c36 Mon Sep 17 00:00:00 2001 From: richard Date: Tue, 10 Sep 2002 02:37:28 +0000 Subject: [PATCH] unit tests pass again git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1116 57a73879-2fb5-44c3-a270-3262357dd7e2 --- TODO.txt | 6 +++--- roundup/mailgw.py | 5 ++--- roundup/roundupdb.py | 4 +++- test/test_mailgw.py | 17 ++++++++++------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/TODO.txt b/TODO.txt index 2331901..eb01a9f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -53,9 +53,9 @@ pending admin: have "set" command be applicable to all items in a class pending admin: add "unset" command pending dist: include the HTML in docs -bug: request.url is incorrect in cgi-bin environments -bug: query editing not translated to new templating -bug: document insance_config -> config +bug web: request.url is incorrect in cgi-bin environments +bug web: query editing not translated to new templating +bug web: need to indicate that generated pages shouldn't be cached done web: Re-enable link backrefs from messages (feature request #568714) done web: have the page layout (header/footer) be templatable diff --git a/roundup/mailgw.py b/roundup/mailgw.py index 8046278..26b66dc 100644 --- a/roundup/mailgw.py +++ b/roundup/mailgw.py @@ -73,10 +73,9 @@ are calling the create() method to create a new node). If an auditor raises an exception, the original message is bounced back to the sender with the explanatory message given in the exception. -$Id: mailgw.py,v 1.83 2002-09-10 00:18:20 richard Exp $ +$Id: mailgw.py,v 1.84 2002-09-10 02:37:27 richard Exp $ ''' - import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri import time, random import traceback, MimeWriter @@ -319,7 +318,7 @@ class MailGW: classname = m.group('classname') if classname is None: # no classname, fallback on the default - if hasattr(self.instance, 'MAIL_DEFAULT_CLASS') and \ + if hasattr(self.instance.config, 'MAIL_DEFAULT_CLASS') and \ self.instance.config.MAIL_DEFAULT_CLASS: classname = self.instance.config.MAIL_DEFAULT_CLASS else: diff --git a/roundup/roundupdb.py b/roundup/roundupdb.py index 8cbf92b..9af9735 100644 --- a/roundup/roundupdb.py +++ b/roundup/roundupdb.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: roundupdb.py,v 1.64 2002-09-10 00:18:20 richard Exp $ +# $Id: roundupdb.py,v 1.65 2002-09-10 02:37:28 richard Exp $ __doc__ = """ Extending hyperdb with types specific to issue-tracking. @@ -405,6 +405,7 @@ class IssueClass: else: l.append(entry) if l: + l.sort() change = '+%s'%(', '.join(l)) l = [] # check for removals @@ -415,6 +416,7 @@ class IssueClass: else: l.append(entry) if l: + l.sort() change += ' -%s'%(', '.join(l)) else: change = '%s -> %s'%(oldvalue, value) diff --git a/test/test_mailgw.py b/test/test_mailgw.py index 63fe8d8..26e4195 100644 --- a/test/test_mailgw.py +++ b/test/test_mailgw.py @@ -8,7 +8,7 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# $Id: test_mailgw.py,v 1.28 2002-09-10 01:27:13 richard Exp $ +# $Id: test_mailgw.py,v 1.29 2002-09-10 02:37:28 richard Exp $ import unittest, cStringIO, tempfile, os, shutil, errno, imp, sys, difflib @@ -80,11 +80,14 @@ class MailgwTestCase(unittest.TestCase, DiffHelper): self.instance = instance.open(self.dirname) # and open the database self.db = self.instance.open('sekrit') - self.db.user.create(username='Chef', address='chef@bork.bork.bork') - self.db.user.create(username='richard', address='richard@test') - self.db.user.create(username='mary', address='mary@test') + self.db.user.create(username='Chef', address='chef@bork.bork.bork', + roles='User') + self.db.user.create(username='richard', address='richard@test', + roles='User') + self.db.user.create(username='mary', address='mary@test', + roles='User') self.db.user.create(username='john', address='john@test', - alternate_addresses='jondoe@test\njohn.doe@test') + alternate_addresses='jondoe@test\njohn.doe@test', roles='User') def tearDown(self): if os.path.exists(os.environ['SENDMAILDEBUG']): @@ -319,7 +322,7 @@ This is a followup ---------- assignedto: -> mary -nosy: +mary, john +nosy: +john, mary status: unread -> chatting _________________________________________________________________________ "Roundup issue tracker" @@ -365,7 +368,7 @@ This is a followup ---------- assignedto: -> mary -nosy: +mary, john +nosy: +john, mary status: unread -> chatting _________________________________________________________________________ "Roundup issue tracker" -- 2.30.2