fixed SCRIPT_NAME in ZRoundup for instances not at top level of Zope

(thanks dman)

fixed some sorting issues that were breaking some unit tests under py2.2

mailgw test output dir was confusing the init test (but only on 2.2 *shrug*)

fixed bug in the init unit test that meant only the bsddb test ran if it
could (it clobbered the anydbm test)

Author: Richard Jones

CHANGES.txt

@@ -40,6 +40,8 @@ Fixed:
  . file upload broke if you didn't supply a change note
  . fixed SCRIPT_NAME in ZRoundup for instances not at top level of Zope
    (thanks dman)
+ . fixed some sorting issues that were breaking some unit tests under py2.2
+ . mailgw test output dir was confusing the init test (but only on 2.2 *shrug*)
 
 
 2002-03-25 - 0.4.1

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.51 2002-04-08 03:46:42 richard Exp $
+# $Id: roundupdb.py,v 1.52 2002-05-15 03:27:16 richard Exp $
 
 __doc__ = """
 Extending hyperdb with types specific to issue-tracking.
@@ -423,6 +423,9 @@ def send_message(self, nodeid, msgid, note, sendto):
         # get the files for this message
         message_files = messages.get(msgid, 'files')
 
+        # make sure the To line is always the same (for testing mostly)
+        sendto.sort()
+
         # create the message
         message = cStringIO.StringIO()
         writer = MimeWriter.MimeWriter(message)
@@ -480,7 +483,8 @@ def send_message(self, nodeid, msgid, note, sendto):
         # now try to send the message
         if SENDMAILDEBUG:
             open(SENDMAILDEBUG, 'w').write('FROM: %s\nTO: %s\n%s\n'%(
-                self.db.config.ADMIN_EMAIL,', '.join(sendto),message.getvalue()))
+                self.db.config.ADMIN_EMAIL,
+                ', '.join(sendto),message.getvalue()))
         else:
             try:
                 # send the message as admin so bounces are sent there
@@ -535,6 +539,7 @@ def generateCreateNote(self, nodeid):
                 key = link.labelprop(default_to_id=1)
                 if key:
                     value = [link.get(entry, key) for entry in value]
+                value.sort()
                 value = ', '.join(value)
             m.append('%s: %s'%(propname, value))
         m.insert(0, '----------')
@@ -620,6 +625,9 @@ def generateChangeNote(self, nodeid, oldvalues):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.51  2002/04/08 03:46:42  richard
+# make it work
+#
 # Revision 1.50  2002/04/08 03:40:31  richard
 #  . added a "detectors" directory for people to put their useful auditors and
 #    reactors in. Note - the roundupdb.IssueClass.sendmessage method has been

test/test_init.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_init.py,v 1.7 2001-10-28 22:51:38 richard Exp $
+# $Id: test_init.py,v 1.8 2002-05-15 03:27:16 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys
 
@@ -25,7 +25,7 @@ class MyTestCase(unittest.TestCase):
     count = 0
     def setUp(self):
         MyTestCase.count = MyTestCase.count + 1
-        self.dirname = '_test_%s'%self.count
+        self.dirname = '_test_init_%s'%self.count
         try:
             shutil.rmtree(self.dirname)
         except OSError, error:
@@ -107,35 +107,40 @@ def testCreation(self):
         l = db.timelog.list()
         ae(l, [])
 
+class bsddbClassicTestCase(ClassicTestCase):
+    backend = 'bsddb'
+class bsddbExtendedTestCase(ExtendedTestCase):
+    backend = 'bsddb'
+
+class bsddb3ClassicTestCase(ClassicTestCase):
+    backend = 'bsddb3'
+class bsddb3ExtendedTestCase(ExtendedTestCase):
+    backend = 'bsddb3'
+
 def suite():
     l = [unittest.makeSuite(ClassicTestCase, 'test'),
          unittest.makeSuite(ExtendedTestCase, 'test')]
     try:
         import bsddb
-        x = ClassicTestCase
-        x.backend = 'bsddb'
-        l.append(unittest.makeSuite(x, 'test'))
-        x = ExtendedTestCase
-        x.backend = 'bsddb'
-        l.append(unittest.makeSuite(x, 'test'))
+        l.append(unittest.makeSuite(bsddbClassicTestCase, 'test'))
+        l.append(unittest.makeSuite(bsddbExtendedTestCase, 'test'))
     except:
         print 'bsddb module not found, skipping bsddb DBTestCase'
 
 #    try:
 #        import bsddb3
-#        x = ClassicTestCase
-#        x.backend = 'bsddb3'
-#        l.append(unittest.makeSuite(x, 'test'))
-#        x = ExtendedTestCase
-#        x.backend = 'bsddb3'
-#        l.append(unittest.makeSuite(x, 'test'))
+#        l.append(unittest.makeSuite(bsddb3ClassicTestCase, 'test'))
+#        l.append(unittest.makeSuite(bsddb3ExtendedTestCase, 'test'))
 #    except:
 #        print 'bsddb3 module not found, skipping bsddb3 DBTestCase'
 
     return unittest.TestSuite(l)
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.7  2001/10/28 22:51:38  richard
+# Fixed ENOENT/WindowsError thing, thanks Juergen Hermann
+#
 # Revision 1.6  2001/09/29 23:48:06  richard
 # Bug fix for test_init on Windows.
 # More documenation!!

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.17 2002-05-02 07:56:34 richard Exp $
+# $Id: test_mailgw.py,v 1.18 2002-05-15 03:27:16 richard Exp $
 
 import unittest, cStringIO, tempfile, os, shutil, errno, imp, sys, difflib
 
@@ -25,10 +25,14 @@ def compareStrings(self, s2, s1):
         '''
         if s1 == s2:
             return
-        # under python2.1 we allow a difference of one trailing empty line.
+
+        # under python2.[12] we allow a difference of one trailing empty line.
         if sys.version_info[0:2] == (2,1):
             if s1+'\n' == s2:
                 return
+        if sys.version_info[0:2] == (2,2):
+            if s1 == s2+'\n':
+                return
 
         l1=s1.split('\n')
         l2=s2.split('\n')
@@ -56,7 +60,7 @@ class MailgwTestCase(unittest.TestCase, DiffHelper):
     schema = 'classic'
     def setUp(self):
         MailgwTestCase.count = MailgwTestCase.count + 1
-        self.dirname = '_test_%s'%self.count
+        self.dirname = '_test_mailgw_%s'%self.count
         try:
             shutil.rmtree(self.dirname)
         except OSError, error:
@@ -97,7 +101,9 @@ def testNewIssue(self):
         if os.path.exists(os.environ['SENDMAILDEBUG']):
             error = open(os.environ['SENDMAILDEBUG']).read()
             self.assertEqual('no error', error)
-        self.assertEqual(self.db.issue.get(nodeid, 'nosy'), ['2', '3'])
+        l = self.db.issue.get(nodeid, 'nosy')
+        l.sort()
+        self.assertEqual(l, ['2', '3'])
 
     def testNewIssueNosy(self):
         self.instance.ADD_AUTHOR_TO_NOSY = 'yes'
@@ -116,7 +122,9 @@ def testNewIssueNosy(self):
         if os.path.exists(os.environ['SENDMAILDEBUG']):
             error = open(os.environ['SENDMAILDEBUG']).read()
             self.assertEqual('no error', error)
-        self.assertEqual(self.db.issue.get(nodeid, 'nosy'), ['2', '3'])
+        l = self.db.issue.get(nodeid, 'nosy')
+        l.sort()
+        self.assertEqual(l, ['2', '3'])
 
     def testAlternateAddress(self):
         message = cStringIO.StringIO('''Content-Type: text/plain;
@@ -191,7 +199,7 @@ def testNewIssueAuthMsg(self):
 ----------
 assignedto: richard
 messages: 1
-nosy: mary, Chef, richard
+nosy: Chef, mary, richard
 status: unread
 title: Testing...
 ___________________________________________________
@@ -226,10 +234,10 @@ def testFollowup(self):
 
         self.compareStrings(open(os.environ['SENDMAILDEBUG']).read(),
 '''FROM: [email protected].
-TO: [email protected], mary@test, john@test
+TO: [email protected], john@test, mary@test
 Content-Type: text/plain
 Subject: [issue1] Testing...
-To: [email protected], mary@test, john@test
+To: [email protected], john@test, mary@test
 From: richard <[email protected].>
 Reply-To: Roundup issue tracker <[email protected].>
 MIME-Version: 1.0
@@ -313,10 +321,10 @@ def testFollowupTitleMatch(self):
 
         self.compareStrings(open(os.environ['SENDMAILDEBUG']).read(),
 '''FROM: [email protected].
-TO: [email protected], mary@test, john@test
+TO: [email protected], john@test, mary@test
 Content-Type: text/plain
 Subject: [issue1] Testing...
-To: [email protected], mary@test, john@test
+To: [email protected], john@test, mary@test
 From: richard <[email protected].>
 Reply-To: Roundup issue tracker <[email protected].>
 MIME-Version: 1.0
@@ -453,10 +461,10 @@ def testFollowupNosyAuthorAndCopy(self):
 
         self.compareStrings(open(os.environ['SENDMAILDEBUG']).read(),
 '''FROM: [email protected].
-TO: john@test, [email protected], richard@test
+TO: [email protected], john@test, richard@test
 Content-Type: text/plain
 Subject: [issue1] Testing...
-To: john@test, [email protected], richard@test
+To: [email protected], john@test, richard@test
 From: john <[email protected].>
 Reply-To: Roundup issue tracker <[email protected].>
 MIME-Version: 1.0
@@ -682,6 +690,14 @@ def suite():
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.17  2002/05/02 07:56:34  richard
+# . added option to automatically add the authors and recipients of messages
+#   to the nosy lists with the options ADD_AUTHOR_TO_NOSY (default 'new') and
+#   ADD_RECIPIENTS_TO_NOSY (default 'new'). These settings emulate the current
+#   behaviour. Setting them to 'yes' will add the author/recipients to the nosy
+#   on messages that create issues and followup messages.
+# . added missing documentation for a few of the config option values
+#
 # Revision 1.16  2002/03/19 21:58:11  grubert
 #  . for python2.1 test_mailgw compareString allows an extra trailing empty line (for quopri.
 #