Repair some test suite regressions.

4 files changed, 14 insertions, 12 deletions

diff --git a/Mailman/docs/addresses.txt b/Mailman/docs/addresses.txt
index d1e83522e..aa3f3a5a3 100644
--- a/Mailman/docs/addresses.txt
+++ b/Mailman/docs/addresses.txt
@@ -124,7 +124,7 @@ the address was validated on.  Neither date is set by default.
     >>> flush()
     >>> print address_4.registered_on
     None
-    >>> print address_4.validated_on
+    >>> print address_4.verified_on
     None
 
 The registered date takes a Python datetime object.
@@ -134,16 +134,16 @@ The registered date takes a Python datetime object.
     >>> flush()
     >>> print address_4.registered_on
     2007-05-08 22:54:01
-    >>> print address_4.validated_on
+    >>> print address_4.verified_on
     None
 
 And of course, you can also set the validation date.
 
-    >>> address_4.validated_on = datetime(2007, 5, 13, 22, 54, 1)
+    >>> address_4.verified_on = datetime(2007, 5, 13, 22, 54, 1)
     >>> flush()
     >>> print address_4.registered_on
     2007-05-08 22:54:01
-    >>> print address_4.validated_on
+    >>> print address_4.verified_on
     2007-05-13 22:54:01
 
 
diff --git a/Mailman/docs/hold.txt b/Mailman/docs/hold.txt
index 7a06c4b81..9574a7935 100644
--- a/Mailman/docs/hold.txt
+++ b/Mailman/docs/hold.txt
@@ -229,6 +229,7 @@ can show this by first holding a message.
     Traceback (most recent call last):
     ...
     ImplicitDestination
+    >>> flush()
 
 There should be two messages in the virgin queue, one to the list owner and
 one to the original author.
@@ -352,10 +353,11 @@ first item is a type code and the second item is a message id.
     ...     if mo:
     ...         cookie = mo.group('cookie')
     ...         break
-    >>> data = mlist.pend_confirm(cookie)
-    >>> data
-    ('H', ...)
-    >>> filename = 'heldmsg-_xtest@example.com-%d.pck' % data[1]
+    >>> from Mailman.interfaces import IPending
+    >>> data = IPending(config.db).confirm(cookie)
+    >>> sorted(data.items())
+    [('id', '...'), ('type', 'held message')]
+    >>> filename = 'heldmsg-_xtest@example.com-%s.pck' % data['id']
     >>> heldmsg = os.path.join(config.DATA_DIR, filename)
 
 Use helper function to read the held message.
diff --git a/Mailman/docs/news-runner.txt b/Mailman/docs/news-runner.txt
index f5189c0e0..2635710a8 100644
--- a/Mailman/docs/news-runner.txt
+++ b/Mailman/docs/news-runner.txt
@@ -44,7 +44,7 @@ prohibited headers.
     From: aperson@example.com
     To: _xtest@example.com
     Newsgroups: comp.lang.python
-    Message-ID: <mailman..._xtest@example.com>
+    Message-ID: ...
     Lines: 1
     <BLANKLINE>
     A message
@@ -74,7 +74,7 @@ X-Original-* header that the news server doesn't care about.
     >>> print msg.as_string()
     From: aperson@example.com
     Newsgroups: comp.lang.python
-    Message-ID: <mailman..._xtest@example.com>
+    Message-ID: ...
     Lines: 1
     To: _xtest@example.com
     X-Original-To: two@example.com
@@ -109,7 +109,7 @@ the message.
     Cc: someother@example.com
     Content-Transfer-Encoding: yes
     Newsgroups: comp.lang.python
-    Message-ID: <mailman..._xtest@example.com>
+    Message-ID: ...
     Lines: 1
     <BLANKLINE>
     A message
diff --git a/Mailman/docs/pending.txt b/Mailman/docs/pending.txt
index 518dadf87..4bdd7dec3 100644
--- a/Mailman/docs/pending.txt
+++ b/Mailman/docs/pending.txt
@@ -15,7 +15,7 @@ This is not where messages held for administrator approval are kept.
 In order to pend an event, you first need a pending database, which is
 available by adapting the list manager.
 
-    >>> pendingdb = IPending(config.list_manager)
+    >>> pendingdb = IPending(config.db)
     >>> verifyObject(IPending, pendingdb)
     True