From 89f6e779db51478ea95b71f2ad3dc9d7f5f51e05 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 4 Nov 2012 15:49:08 -0500
Subject: Configuration -------------  * `[passlib]path` configuration variable
 renamed to `[passlib]configuration`.  * Postfix-specific configurations in
 the `[mta]` section are moved to a    separate file, named by the
 `[mta]configuration` variable.  * In the new `postfix.cfg` file,
 `postfix_map_cmd` is renamed to    `postmap_command`.

Also:
 * More Python 2.7-isms, use assertMultiLineEqual() directly.
 * Added external_configuration() and load_external() to mailman.config.config
 * ConfigLayer does a blanket set of [postfix]postmap_command so subtests
   generally won't have to.
---
 src/mailman/chains/tests/test_hold.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mailman/chains/tests/test_hold.py')

diff --git a/src/mailman/chains/tests/test_hold.py b/src/mailman/chains/tests/test_hold.py
index 515894505..66f43fa60 100644
--- a/src/mailman/chains/tests/test_hold.py
+++ b/src/mailman/chains/tests/test_hold.py
@@ -44,9 +44,8 @@ class TestAutorespond(unittest.TestCase):
 
     def setUp(self):
         self._mlist = create_list('test@example.com')
-        # Python 2.7 has assertMultiLineEqual.  Let this work without bounds.
+        # Let assertMultiLineEqual work without bounds.
         self.maxDiff = None
-        self.eq = getattr(self, 'assertMultiLineEqual', self.assertEqual)
 
     @configuration('mta', max_autoresponses_per_day=1)
     def test_max_autoresponses_per_day(self):
@@ -71,7 +70,7 @@ class TestAutorespond(unittest.TestCase):
         del message['message-id']
         self.assertTrue('date' in message)
         del message['date']
-        self.eq(messages[0].msg.as_string(), """\
+        self.assertMultiLineEqual(messages[0].msg.as_string(), """\
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-- 
cgit v1.2.3-70-g09d2