From 75f8476bee354a9d1a4fc2492f39a06b51d07481 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 9 Nov 2014 07:52:58 -0500
Subject:  * You no longer have to edit `src/mailman/testing/testing.cfg` to
 run the    test suite against PostgreSQL.  See `src/mailman/docs/START.rst`
 for    details.

Also:

* Test fixes.
* Doc fixes.
* PostgreSQL/model fixes.
---
 src/mailman/app/docs/hooks.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mailman/app/docs/hooks.rst')

diff --git a/src/mailman/app/docs/hooks.rst b/src/mailman/app/docs/hooks.rst
index ca33f55fe..eb6cbac05 100644
--- a/src/mailman/app/docs/hooks.rst
+++ b/src/mailman/app/docs/hooks.rst
@@ -53,11 +53,14 @@ script that will produce no output to force the hooks to run.
     >>> from mailman.testing.layers import ConfigLayer
     >>> def call():
     ...     exe = os.path.join(os.path.dirname(sys.executable), 'mailman')
+    ...     env = dict(MAILMAN_CONFIG_FILE=config_path,
+    ...                PYTHONPATH=config_directory)
+    ...     test_cfg = os.environ.get('MAILMAN_EXTRA_TESTING_CFG')
+    ...     if test_cfg is not None:
+    ...         env['MAILMAN_EXTRA_TESTING_CFG'] = test_cfg
     ...     proc = subprocess.Popen(
     ...         [exe, 'lists', '--domain', 'ignore', '-q'],
-    ...         cwd=ConfigLayer.root_directory,
-    ...         env=dict(MAILMAN_CONFIG_FILE=config_path,
-    ...                  PYTHONPATH=config_directory),
+    ...         cwd=ConfigLayer.root_directory, env=env,
     ...         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     ...     stdout, stderr = proc.communicate()
     ...     assert proc.returncode == 0, stderr
-- 
cgit v1.2.3-70-g09d2