diff options
| author | Cyril Roelandt <cyril@redhat.com> | 2023-04-12 20:31:05 +0200 |
|---|---|---|
| committer | Cyril Roelandt <cyril@redhat.com> | 2023-04-12 20:37:47 +0200 |
| commit | 41da684fe41e48eca934aca1f19fbb779be07fc4 (patch) | |
| tree | 71e6574cdbd696df72981b13b3e4cb8aa477ca04 | |
| parent | cb4ac8d37deeadaa43e74125fa8950cd331d4b3e (diff) | |
| download | glance-41da684fe41e48eca934aca1f19fbb779be07fc4.tar.gz | |
Fix functional test failures with PasteDeploy 3.x
PasteDeploy replaced pkg_resources with importlib_metadata[1] in 3.0.
This causes functional test failures because the line breaks in the
example configs from glance/tests/functional/__init__.py are read as a
"prefix" by PasteDeploy. For instance,
paste.filter_factory =
glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
is read as "\nglance.api.middleware.version_negotiation:VersionNegotiationFilter.factory".
This might be a bug in PasteDeploy or (quite unlikely) in
configparser.ConfigParser rather than in our code, so this issue should
be revisited at some point. For now, remove the cosmetic line breaks in
order to fix our gates.
[1] https://github.com/Pylons/pastedeploy/commit/ef58c20961072e4f60c26e94564180c304af7144
Change-Id: I1e557e731cceb3cfbc4ebc3f0887adf372a91d1d
| -rw-r--r-- | glance/tests/functional/__init__.py | 18 | ||||
| -rw-r--r-- | tox.ini | 1 |
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 @@ -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 |