]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #31190 from rhcs-dashboard/wip-42294-nautilus
authorLenz Grimmer <lgrimmer@suse.com>
Thu, 6 Feb 2020 10:17:22 +0000 (10:17 +0000)
committerGitHub <noreply@github.com>
Thu, 6 Feb 2020 10:17:22 +0000 (10:17 +0000)
nautilus: mgr/dashboard: add debug mode, and accept expected exception when SSL handshaking

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
1  2 
src/pybind/mgr/dashboard/HACKING.rst
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/dashboard/tests/__init__.py
src/pybind/mgr/mgr_module.py

Simple merge
Simple merge
index 77723d6ae6d3f210be913845d535dac623b16be7,242beb5238a58b7f244b3dc8dfe1747073031a5b..689e0097859ac8bbc55dc1daef2acec15863208e
@@@ -118,9 -113,10 +125,10 @@@ class ControllerTestCase(helper.CPWebCa
              'tools.json_in.on': True,
              'tools.json_in.force': False
          })
+         PLUGIN_MANAGER.hook.configure_cherrypy(config=cherrypy.config)
          super(ControllerTestCase, self).__init__(*args, **kwargs)
  
 -    def _request(self, url, method, data=None):
 +    def _request(self, url, method, data=None, headers=None):
          if not data:
              b = None
              h = None
Simple merge