Skip to content

Commit 3171b49

Browse files
author
Richard Jones
committed
unit tests pass again
1 parent 9953fd3 commit 3171b49

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

TODO.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ pending admin: have "set" command be applicable to all items in a class
5353
pending admin: add "unset" command
5454
pending dist: include the HTML in docs
5555

56-
bug: request.url is incorrect in cgi-bin environments
57-
bug: query editing not translated to new templating
58-
bug: document insance_config -> config
56+
bug web: request.url is incorrect in cgi-bin environments
57+
bug web: query editing not translated to new templating
58+
bug web: need to indicate that generated pages shouldn't be cached
5959

6060
done web: Re-enable link backrefs from messages (feature request #568714)
6161
done web: have the page layout (header/footer) be templatable

roundup/mailgw.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.83 2002-09-10 00:18:20 richard Exp $
76+
$Id: mailgw.py,v 1.84 2002-09-10 02:37:27 richard Exp $
7777
'''
7878

79-
8079
import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
8180
import time, random
8281
import traceback, MimeWriter
@@ -319,7 +318,7 @@ def handle_message(self, message):
319318
classname = m.group('classname')
320319
if classname is None:
321320
# no classname, fallback on the default
322-
if hasattr(self.instance, 'MAIL_DEFAULT_CLASS') and \
321+
if hasattr(self.instance.config, 'MAIL_DEFAULT_CLASS') and \
323322
self.instance.config.MAIL_DEFAULT_CLASS:
324323
classname = self.instance.config.MAIL_DEFAULT_CLASS
325324
else:

roundup/roundupdb.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: roundupdb.py,v 1.64 2002-09-10 00:18:20 richard Exp $
18+
# $Id: roundupdb.py,v 1.65 2002-09-10 02:37:28 richard Exp $
1919

2020
__doc__ = """
2121
Extending hyperdb with types specific to issue-tracking.
@@ -405,6 +405,7 @@ def generateChangeNote(self, nodeid, oldvalues):
405405
else:
406406
l.append(entry)
407407
if l:
408+
l.sort()
408409
change = '+%s'%(', '.join(l))
409410
l = []
410411
# check for removals
@@ -415,6 +416,7 @@ def generateChangeNote(self, nodeid, oldvalues):
415416
else:
416417
l.append(entry)
417418
if l:
419+
l.sort()
418420
change += ' -%s'%(', '.join(l))
419421
else:
420422
change = '%s -> %s'%(oldvalue, value)

test/test_mailgw.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1010
#
11-
# $Id: test_mailgw.py,v 1.28 2002-09-10 01:27:13 richard Exp $
11+
# $Id: test_mailgw.py,v 1.29 2002-09-10 02:37:28 richard Exp $
1212

1313
import unittest, cStringIO, tempfile, os, shutil, errno, imp, sys, difflib
1414

@@ -80,11 +80,14 @@ def setUp(self):
8080
self.instance = instance.open(self.dirname)
8181
# and open the database
8282
self.db = self.instance.open('sekrit')
83-
self.db.user.create(username='Chef', address='[email protected]')
84-
self.db.user.create(username='richard', address='richard@test')
85-
self.db.user.create(username='mary', address='mary@test')
83+
self.db.user.create(username='Chef', address='[email protected]',
84+
roles='User')
85+
self.db.user.create(username='richard', address='richard@test',
86+
roles='User')
87+
self.db.user.create(username='mary', address='mary@test',
88+
roles='User')
8689
self.db.user.create(username='john', address='john@test',
87-
alternate_addresses='jondoe@test\njohn.doe@test')
90+
alternate_addresses='jondoe@test\njohn.doe@test', roles='User')
8891

8992
def tearDown(self):
9093
if os.path.exists(os.environ['SENDMAILDEBUG']):
@@ -319,7 +322,7 @@ def testFollowup(self):
319322
320323
----------
321324
assignedto: -> mary
322-
nosy: +mary, john
325+
nosy: +john, mary
323326
status: unread -> chatting
324327
_________________________________________________________________________
325328
"Roundup issue tracker" <[email protected]>
@@ -365,7 +368,7 @@ def testFollowupTitleMatch(self):
365368
366369
----------
367370
assignedto: -> mary
368-
nosy: +mary, john
371+
nosy: +john, mary
369372
status: unread -> chatting
370373
_________________________________________________________________________
371374
"Roundup issue tracker" <[email protected]>

0 commit comments

Comments
 (0)