summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-04-12 20:52:23 +0000
committerGerrit Code Review <review@openstack.org>2023-04-12 20:52:23 +0000
commit0b822f1fab40c84e790f753318964d4a5748a8b6 (patch)
treee208ff734f96a20a0b578f078c887233e642518a
parentb023562e1d31d3e60c195d701e6a9ff52e2fc956 (diff)
parent41da684fe41e48eca934aca1f19fbb779be07fc4 (diff)
downloadglance-0b822f1fab40c84e790f753318964d4a5748a8b6.tar.gz
Merge "Fix functional test failures with PasteDeploy 3.x"
-rw-r--r--glance/tests/functional/__init__.py18
-rw-r--r--tox.ini1
2 files changed, 7 insertions, 12 deletions
diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py
index 2573c3e22..a18090b3f 100644
--- a/glance/tests/functional/__init__.py
+++ b/glance/tests/functional/__init__.py
@@ -515,8 +515,7 @@ backends = disable_by_file
disable_by_file_path = %(disable_path)s
[filter:versionnegotiation]
-paste.filter_factory =
- glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
+paste.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
[filter:gzip]
paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory
@@ -525,15 +524,13 @@ paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory
paste.filter_factory = glance.api.middleware.cache:CacheFilter.factory
[filter:cache_manage]
-paste.filter_factory =
- glance.api.middleware.cache_manage:CacheManageFilter.factory
+paste.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter.factory
[filter:context]
paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
[filter:unauthenticated-context]
-paste.filter_factory =
- glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
+paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
[filter:fakeauth]
paste.filter_factory = glance.tests.utils:FakeAuthMiddleware.factory
@@ -693,8 +690,7 @@ backends = disable_by_file
disable_by_file_path = %(disable_path)s
[filter:versionnegotiation]
-paste.filter_factory =
- glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
+paste.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
[filter:gzip]
paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory
@@ -703,15 +699,13 @@ paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory
paste.filter_factory = glance.api.middleware.cache:CacheFilter.factory
[filter:cache_manage]
-paste.filter_factory =
- glance.api.middleware.cache_manage:CacheManageFilter.factory
+paste.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter.factory
[filter:context]
paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
[filter:unauthenticated-context]
-paste.filter_factory =
- glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
+paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
[filter:fakeauth]
paste.filter_factory = glance.tests.utils:FakeAuthMiddleware.factory
diff --git a/tox.ini b/tox.ini
index b1a0ea9c7..8976a66c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -115,6 +115,7 @@ ignore-path = .venv,.git,.tox,.eggs,*glance/locale*,*lib/python*,glance.egg*,api
ignore = E402,E711,E712,H404,H405,W503,W504
enable-extensions = H904
exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*lib/python*,*egg,build
+per-file-ignores = glance/tests/functional/__init__.py:E501
[hacking]
import_exceptions = glance.i18n