[checkmk-commits] Fixed port conflicts with EC during tests

Module: check_mk Branch: master Commit: 8db96a676162c90b28bf3af6e270bfa2a1c4b044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db96a676162c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 15:58:58 2016 +0100 Fixed port conflicts with EC during tests --- tests/testlib/__init__.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 496f8ab..be63e83 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -375,18 +375,21 @@ class Site(object): if self.reuse and self.exists(): port = int(self.get_config("LIVESTATUS_TCP_PORT")) else: - port = 9123 - print "Trying port %d" % port - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - while sock.connect_ex(('127.0.0.1', port)) == 0: - print "Port %d is already used, trying next" % port - port += 1 - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - print "Using port %d" % port + port = self.get_free_port_from(9123) self._livestatus_port = port + def get_free_port_from(self, port): + print "Trying port %d" % port + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + while sock.connect_ex(('127.0.0.1', port)) == 0: + print "Port %d is already used, trying next" % port + port += 1 + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + print "Using port %d" % port + return port + # Problem: The group change only affects new sessions of the test_user #def add_test_user_to_site_group(self): # test_user = pwd.getpwuid(os.getuid())[0] @@ -779,7 +782,7 @@ class CMKEventConsole(CMKWebSession): if self.site.reuse and self.site.exists() and "remote_status" in config: port = config["remote_status"][0] else: - port = self.site.livestatus_port + 1 + port = self.site.get_free_port_from(self.site.livestatus_port + 1) self.status_port = port