mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

Merge branch 'trac1852' of ssh://git.bind10.isc.org/var/bind10/git/bind10

Browse Source
This commit is contained in:
Naoki Kambe
2012-05-01 17:39:17 +09:00
parent 3055e37cd7 92cc4a7b43
commit a475ef271d
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/stats/stats_httpd.py.in
View File

@@ -189,7 +189,12 @@ class StatsHttpd:
self.load_config()
self.http_addrs = []
self.mccs.start()
self.open_httpd()
try:
self.open_httpd()
except HttpServerError:
# if some exception, e.g. address in use, is raised, then it closes mccs and httpd
self.close_mccs()
raise
def open_mccs(self):
"""Opens a ModuleCCSession object"""

18
src/bin/stats/tests/b10-stats-httpd_test.py
View File

@@ -676,6 +676,24 @@ class TestStatsHttpd(unittest.TestCase):
self.assertTrue('address' in self.stats_httpd.config['listen_on'][0])
self.assertTrue('port' in self.stats_httpd.config['listen_on'][0])
self.assertTrue(server_address in set(self.stats_httpd.http_addrs))
ans = send_command(
isc.config.ccsession.COMMAND_GET_MODULE_SPEC,
"ConfigManager", {"module_name":"StatsHttpd"})
# assert StatsHttpd is added to ConfigManager
self.assertNotEqual(ans, (0,{}))
self.assertTrue(ans[1]['module_name'], 'StatsHttpd')
def test_init_hterr(self):
orig_open_httpd = stats_httpd.StatsHttpd.open_httpd
def err_open_httpd(arg): raise stats_httpd.HttpServerError
stats_httpd.StatsHttpd.open_httpd = err_open_httpd
self.assertRaises(stats_httpd.HttpServerError, stats_httpd.StatsHttpd)
ans = send_command(
isc.config.ccsession.COMMAND_GET_MODULE_SPEC,
"ConfigManager", {"module_name":"StatsHttpd"})
# assert StatsHttpd is removed from ConfigManager
self.assertEqual(ans, (0,{}))
stats_httpd.StatsHttpd.open_httpd = orig_open_httpd
def test_openclose_mccs(self):
self.stats_httpd = MyStatsHttpd(get_availaddr())