diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-11 01:47:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-11 01:47:13 +0000 |
| commit | 0604836553df53179bf5710ea0dcd5e9255ca6a9 (patch) | |
| tree | 4107a01993b6c7a1c1100a7738f4859b73147d4c /oslo_middleware | |
| parent | bff184a2b5b1a0d3d22508a7544075378aca9e13 (diff) | |
| parent | 7b9709cda90d410e17754e8625f82d7d2255de68 (diff) | |
| download | oslo-middleware-0604836553df53179bf5710ea0dcd5e9255ca6a9.tar.gz | |
Merge "Update response body when healthcheck is available"
Diffstat (limited to 'oslo_middleware')
| -rw-r--r-- | oslo_middleware/healthcheck/disable_by_file.py | 4 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_healthcheck.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oslo_middleware/healthcheck/disable_by_file.py b/oslo_middleware/healthcheck/disable_by_file.py index 61a55c8..cd438cf 100644 --- a/oslo_middleware/healthcheck/disable_by_file.py +++ b/oslo_middleware/healthcheck/disable_by_file.py @@ -45,10 +45,10 @@ class DisableByFileHealthcheck(pluginbase.HealthcheckBaseExtension): LOG.warning(_LW('DisableByFile healthcheck middleware enabled ' 'without disable_by_file_path set')) return pluginbase.HealthcheckResult(available=True, - reason="") + reason="OK") elif not os.path.exists(path): return pluginbase.HealthcheckResult(available=True, - reason="") + reason="OK") else: return pluginbase.HealthcheckResult(available=False, reason="DISABLED BY FILE") diff --git a/oslo_middleware/tests/test_healthcheck.py b/oslo_middleware/tests/test_healthcheck.py index 46d964c..a9fa2a9 100644 --- a/oslo_middleware/tests/test_healthcheck.py +++ b/oslo_middleware/tests/test_healthcheck.py @@ -54,7 +54,7 @@ class HealthcheckTests(test_base.BaseTestCase): @mock.patch('logging.warn') def test_disablefile_unconfigured(self, fake_warn): conf = {'backends': 'disable_by_file'} - self._do_test(conf, expected_body=b'') + self._do_test(conf, expected_body=b'OK') self.assertIn('disable_by_file', self.app._backends.names()) fake_warn.assert_called_once('DisableByFile healthcheck middleware ' 'enabled without disable_by_file_path ' @@ -63,7 +63,7 @@ class HealthcheckTests(test_base.BaseTestCase): def test_disablefile_enabled(self): conf = {'backends': 'disable_by_file', 'disable_by_file_path': '/foobar'} - self._do_test(conf, expected_body=b'') + self._do_test(conf, expected_body=b'OK') self.assertIn('disable_by_file', self.app._backends.names()) def test_disablefile_disabled(self): |