From ac958ab67ee86d86302d27a97ce0cb8d2cc8c832 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 1 Dec 2013 17:28:02 -0500
Subject: Fix a couple of intermittent test problems.

---
 src/mailman/rest/docs/helpers.rst | 1 +
 src/mailman/testing/helpers.py    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/mailman/rest/docs/helpers.rst b/src/mailman/rest/docs/helpers.rst
index 4f0b1c804..3e8092f4e 100644
--- a/src/mailman/rest/docs/helpers.rst
+++ b/src/mailman/rest/docs/helpers.rst
@@ -27,6 +27,7 @@ be set in the configuration file.
     ... use_https: yes
     ... api_version: 4.2
     ... """)
+    >>> cleanups.append((config.pop, 'helpers'))
 
     >>> print path_to('system')
     https://geddy:2112/4.2/system
diff --git a/src/mailman/testing/helpers.py b/src/mailman/testing/helpers.py
index 9f9e28dc6..af49c35af 100644
--- a/src/mailman/testing/helpers.py
+++ b/src/mailman/testing/helpers.py
@@ -46,6 +46,7 @@ import mock
 import time
 import uuid
 import errno
+import shutil
 import signal
 import socket
 import logging
@@ -482,6 +483,7 @@ def reset_the_world():
     for dirpath, dirnames, filenames in os.walk(config.MESSAGES_DIR):
         for filename in filenames:
             os.remove(os.path.join(dirpath, filename))
+        shutil.rmtree(dirpath)
     # Reset the global style manager.
     getUtility(IStyleManager).populate()
     # Remove all dynamic header-match rules.
-- 
cgit v1.2.3-70-g09d2