Module: check_mk Branch: master Commit: 9754e052e857171efd92372cdda6384cf7f50eff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9754e052e85717… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 15:59:53 2017 +0200 Revert "liveproxyd large number of sites test: now connecting with 3 channels to 600 sites" Needs to be reverted because prlimit is not available on all needed platforms. This reverts commit 42649e25c1e0fac1771d1c00d74f3fc320423007. Change-Id: Iad36d95c575241a8dfdd2970f1f275905fd8315b --- tests/livestatus/test_liveproxyd.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index c131dba..39bfbf5 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -130,16 +130,21 @@ def test_large_number_of_sites(default_cfg, site): _toggle_liveproxyd(site, use_liveproxyd=True) # Increase nofiles limit of CMC to prevent that it runs in "too many open files" resource limits - exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() - assert exit_code == 0 + #exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() + #assert exit_code == 0 - site_sockets, num_sites, num_channels = {}, 600, 3 + site_sockets, num_sites, num_channels = {}, 200, 3 for site_num in range(num_sites): # Currently connect to local site site_id = "site%03d" % site_num + #if site_num % 2 == 0: + to_livestatus = None + #else: + # to_livestatus = ('127.0.0.1', 6999) + site_sockets[site_id] = { - "to_livestatus" : None, + "to_livestatus" : to_livestatus, "to_proxy" : "unix:%s/tmp/run/liveproxy/%s" % (site.root, site_id), }