Merge lp:~toshio/mailman/py2.6 into lp:mailman

[Toshio Kuratomi]

Fix unittest to take into account incompatibile output between python2.6 and python2.7 logging module

[Barry Warsaw (barry)]

I just fixed this in a different way, not to be confused with the *right* way. ;)

Unmerged revisions

7119. By toshio <email address hidden> on 2012-03-15

Make my comment about the nature of this fix slightly better

7118. By toshio <email address hidden> on 2012-03-15

Fix an incompatibility between python2.6 and python2.7 for the prototype archiver unittests

=== modified file 'src/mailman/archiving/tests/test_prototype.py'
--- src/mailman/archiving/tests/test_prototype.py	2012-03-14 23:44:30 +0000
+++ src/mailman/archiving/tests/test_prototype.py	2012-03-15 17:40:24 +0000
@@ -150,13 +150,15 @@
             archive_thread.run()
             # Test that the archiver output the correct error.
             line = mark.readline()
-            self.assertEqual(
-                # Strip out the timestamp.
-                line[28:-1],
+            # Use endswith() so that we ignore timestamp.
+            # Offsets don't work because of slightly differently formatted
+            # output between python2.6 and python2.7
+            self.assertTrue(
+                line.strip().endswith(
                 'Unable to acquire prototype archiver lock for {0}, '
                 'discarding: {1}'.format(
                     self._mlist.fqdn_listname,
-                    self._msg.get('message-id')))
+                    self._msg.get('message-id'))))
         # Check that the message didn't get archived.
         created_files = self._find(config.ARCHIVE_DIR)
         self.assertEqual(self._expected_dir_structure, created_files)