From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [94.100.177.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 32039469710 for ; Wed, 20 May 2020 19:18:04 +0300 (MSK) From: sergeyb@tarantool.org Date: Wed, 20 May 2020 19:16:58 +0300 Message-Id: <44be366b7f79a73fa2d9c06f28a5551e58bbb860.1589991392.git.sergeyb@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] test: recover FreeBSD skip conditions List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: o.piskunov@tarantool.org, alexander.turenko@tarantool.org From: Sergey Bronnikov Due to inaccuracy FreeBSD skip conditions were overwritten by OpenBSD skip conditions. Closes #5004 --- test/app/crypto.skipcond | 4 ++++ test/app/digest.skipcond | 4 ++++ test/app/socket.skipcond | 30 +++++++++++++++++++++++++++--- test/box/net.box.skipcond | 4 ++++ test/box/net_msg_max.skipcond | 4 ++++ 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/test/app/crypto.skipcond b/test/app/crypto.skipcond index 9c1ca22b1..108e776c4 100644 --- a/test/app/crypto.skipcond +++ b/test/app/crypto.skipcond @@ -1,5 +1,9 @@ import platform +# Disabled on FreeBSD due to flaky fail #4271. +if platform.system() == 'FreeBSD': + self.skip = 1 + # Disabled on OpenBSD due to fail #XXXX. if platform.system() == 'OpenBSD': self.skip = 1 diff --git a/test/app/digest.skipcond b/test/app/digest.skipcond index 9c1ca22b1..108e776c4 100644 --- a/test/app/digest.skipcond +++ b/test/app/digest.skipcond @@ -1,5 +1,9 @@ import platform +# Disabled on FreeBSD due to flaky fail #4271. +if platform.system() == 'FreeBSD': + self.skip = 1 + # Disabled on OpenBSD due to fail #XXXX. if platform.system() == 'OpenBSD': self.skip = 1 diff --git a/test/app/socket.skipcond b/test/app/socket.skipcond index 9c1ca22b1..a3748b093 100644 --- a/test/app/socket.skipcond +++ b/test/app/socket.skipcond @@ -1,7 +1,31 @@ + +# vim: set ft=python : +import re +import os.path +import socket +import os +import tempfile import platform -# Disabled on OpenBSD due to fail #XXXX. -if platform.system() == 'OpenBSD': +test_dir = tempfile.mkdtemp(prefix='tarantool-test-socket') +test_path = os.path.join(test_dir, 'socket') + +s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) +try: + s.bind(test_path) +except: self.skip = 1 -# vim: set ft=python: +s.close() + +if os.path.exists(test_path): + os.remove(test_path) + os.rmdir(test_dir) + +# Disabled on FreeBSD due to flaky fail #4271. +if platform.system() == 'FreeBSD': + self.skip = 1 + +# Disabled on OpenBSD due to fail #XXX. +if platform.system() == 'OpenBSD': + self.skip = 1 diff --git a/test/box/net.box.skipcond b/test/box/net.box.skipcond index 9c1ca22b1..58b83f415 100644 --- a/test/box/net.box.skipcond +++ b/test/box/net.box.skipcond @@ -4,4 +4,8 @@ import platform if platform.system() == 'OpenBSD': self.skip = 1 +# Disabled on FreeBSD due to flaky fail #4271. +if platform.system() == 'FreeBSD': + self.skip = 1 + # vim: set ft=python: diff --git a/test/box/net_msg_max.skipcond b/test/box/net_msg_max.skipcond index 9c1ca22b1..58b83f415 100644 --- a/test/box/net_msg_max.skipcond +++ b/test/box/net_msg_max.skipcond @@ -4,4 +4,8 @@ import platform if platform.system() == 'OpenBSD': self.skip = 1 +# Disabled on FreeBSD due to flaky fail #4271. +if platform.system() == 'FreeBSD': + self.skip = 1 + # vim: set ft=python: -- 2.23.0