Skip to content

GitLab

C
ceph
Commit 53f4704c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fix run-tox-mgr test failure

parent 719d3beb
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
Makefile
View file @ 53f4704c
......@@ -40,6 +40,7 @@ all: ceph-config
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ErasureCodeShec.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ceph_thread_timeout.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_cram.patch
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_mypy.patch
cp cram-0.5.0.post20110114.tar.gz ceph-15.2.4/src/test/downloads
if [ `uname -m` = 'armv7l' ] ; then \
patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-arm32_fix.patch ; \
......
ceph-15.2.4-fix_mypy.patch 0 → 100644
View file @ 53f4704c
diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/cherrypy_backports.py ceph-15.2.4-fix_mypy/src/pybind/mgr/dashboard/cherrypy_backports.py
--- ceph-15.2.4/src/pybind/mgr/dashboard/cherrypy_backports.py 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_mypy/src/pybind/mgr/dashboard/cherrypy_backports.py 2022-01-23 11:51:01.356453830 +1030
@@ -75,7 +75,7 @@
if v < StrictVersion("9.0.0"):
from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter as builtin_ssl
else:
- from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl
+ from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl # type: ignore
builtin_ssl.wrap = new_wrap(builtin_ssl.wrap)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment