summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2018-11-06 20:35:10 -0600
committerGitHub <noreply@github.com>2018-11-06 20:35:10 -0600
commit420ea05bee3ad376c4369f401b2696b31312c5e1 (patch)
tree4e5b0cb7e31dbb6e5ac070bfe1f1b9f03e2ec36e /src
parent229137d3461cb901b7145974d5294564f7ab5135 (diff)
parent4b9da6af118b4566da4b9a36eb41a047cd587a76 (diff)
downloadpyramid-420ea05bee3ad376c4369f401b2696b31312c5e1.tar.gz
pyramid-420ea05bee3ad376c4369f401b2696b31312c5e1.tar.bz2
pyramid-420ea05bee3ad376c4369f401b2696b31312c5e1.zip
Merge pull request #3417 from mmerickel/fix-registry
call fix_registry so that queryAdapterOrSelf is available
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/testing.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pyramid/testing.py b/src/pyramid/testing.py
index ea86f5852..f700b5a4e 100644
--- a/src/pyramid/testing.py
+++ b/src/pyramid/testing.py
@@ -509,6 +509,7 @@ def setUp(
)
if settings is None:
settings = {}
+ config._fix_registry()
if getattr(registry, 'settings', None) is None:
config._set_settings(settings)
if hasattr(registry, 'registerUtility'):