From 91b923b08cfbe53c73ef9f6dee092f105a72be6b Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 4 Jan 2019 13:50:48 +0100
Subject: [PATCH] pytests/kresd: change order of tcp/tls alive pings
---
tests/pytests/kresd.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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):
--
GitLab