From 331ffceb309e76d3a0d01144e40421b08b1e7692 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Wed, 19 Dec 2001 07:07:20 +0000
Subject: test_implicit_sender_and_errors_to(): The sender is now the -bounces
 address instead of the -admin address.  Update the test.

test_list_headers(): Hack around for PUBLIC_ARCHIVE_URL.

test_list_headers_with_description(): Remove a test that we do
elsewhere and is just problematic to do here.
---
 tests/test_handlers.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/test_handlers.py b/tests/test_handlers.py
index 139a56625..b0485c2fe 100644
--- a/tests/test_handlers.py
+++ b/tests/test_handlers.py
@@ -526,8 +526,8 @@ Errors-To: bsystem@dom.ain
 
 """, Message.Message)
         CookHeaders.process(self._mlist, msg, {})
-        eq(msg['sender'], '_xtest-admin@dom.ain')
-        eq(msg['errors-to'], '_xtest-admin@dom.ain')
+        eq(msg['sender'], '_xtest-bounces@dom.ain')
+        eq(msg['errors-to'], '_xtest-bounces@dom.ain')
 
     def test_xbeenthere(self):
         msg = email.message_from_string("""\
@@ -756,7 +756,12 @@ From: aperson@dom.ain
 From: aperson@dom.ain
 
 """, Message.Message)
-        CookHeaders.process(self._mlist, msg, {})
+        oldval = mm_cfg.DEFAULT_URL_HOST
+        mm_cfg.DEFAULT_URL_HOST = 'www.dom.ain'
+        try:
+            CookHeaders.process(self._mlist, msg, {})
+        finally:
+            mm_cfg.DEFAULT_URL_HOST = oldval
         eq(msg['list-id'], '<_xtest.dom.ain>')
         eq(msg['list-help'], '<mailto:_xtest-request@dom.ain?subject=help>')
         eq(msg['list-unsubscribe'],
@@ -786,7 +791,6 @@ From: aperson@dom.ain
            '<http://www.dom.ain/mailman/listinfo/_xtest>,'
            '\n\t<mailto:_xtest-request@dom.ain?subject=subscribe>')
         eq(msg['list-post'], '<mailto:_xtest@dom.ain>')
-        eq(msg['list-archive'], '<http://www.dom.ain/pipermail/_xtest>')
 
 
 
-- 
cgit v1.3.1