From: Tomas Krizek Date: Fri, 4 Jan 2019 12:50:48 +0000 (+0100) Subject: pytests/kresd: change order of tcp/tls alive pings X-Git-Tag: v3.2.1~6^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91b923b08cfbe53c73ef9f6dee092f105a72be6b;p=thirdparty%2Fknot-resolver.git pytests/kresd: change order of tcp/tls alive pings --- diff --git a/tests/pytests/kresd.py b/tests/pytests/kresd.py index 99446dd80..5c790578b 100644 --- a/tests/pytests/kresd.py +++ b/tests/pytests/kresd.py @@ -129,11 +129,11 @@ class Kresd(ContextDecorator): def all_ports_alive(self, msgid=10001): alive = True if self.ip: - alive &= utils.try_ping_alive(self.ip_tls_socket(), close=True, msgid=msgid) - alive &= utils.try_ping_alive(self.ip_tcp_socket(), close=True, msgid=msgid + 1) + alive &= utils.try_ping_alive(self.ip_tcp_socket(), close=True, msgid=msgid) + alive &= utils.try_ping_alive(self.ip_tls_socket(), close=True, msgid=msgid + 1) if self.ip6: - alive &= utils.try_ping_alive(self.ip6_tls_socket(), close=True, msgid=msgid + 2) - alive &= utils.try_ping_alive(self.ip6_tcp_socket(), close=True, msgid=msgid + 3) + alive &= utils.try_ping_alive(self.ip6_tcp_socket(), close=True, msgid=msgid + 2) + alive &= utils.try_ping_alive(self.ip6_tls_socket(), close=True, msgid=msgid + 3) return alive def _wait_for_tcp_port(self, delay=0.1, max_attempts=20):