summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-15 19:33:54 -0400
committerChris McDonough <chrism@plope.com>2012-09-15 19:33:54 -0400
commit97150cc540bad56f8ff7760616d75db8894da73b (patch)
treec1ae5b10d93350b1a763eecdb3857d4aa7af92b6 /docs/api
parenta98f0cf435e31864e632d9105ffdda30aa776212 (diff)
parentd6f0fd56fb93d30d8d7d6b490a57967d940b0135 (diff)
downloadpyramid-97150cc540bad56f8ff7760616d75db8894da73b.tar.gz
pyramid-97150cc540bad56f8ff7760616d75db8894da73b.tar.bz2
pyramid-97150cc540bad56f8ff7760616d75db8894da73b.zip
merge jinty's testConfig code
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/testing.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/api/testing.rst b/docs/api/testing.rst
index f388dc263..1366a1795 100644
--- a/docs/api/testing.rst
+++ b/docs/api/testing.rst
@@ -9,6 +9,8 @@
.. autofunction:: tearDown
+ .. autofunction:: testConfig(registry=None, request=None, hook_zca=True, autocommit=True, settings=None)
+
.. autofunction:: cleanUp
.. autoclass:: DummyResource