Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v1 2/3] test: need to run all test suites on OSX
Date: Wed,  6 Nov 2019 14:37:30 +0300	[thread overview]
Message-ID: <45a010fdac3c440902b81cc5cc8484355b1a0413.1573039651.git.avtikhon@tarantool.org> (raw)
In-Reply-To: <cover.1573039651.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1573039651.git.avtikhon@tarantool.org>

Enabled complete testing for OSX, temporary skipped the
failed suite replication/ and tests engine/replica_join
with issue #4370 and small/quota from repository
https://github.com/tarantool/small.git with issue #4357
to enable it back. Also fixed the OSX ulimit setup
different for VBOX and Travis-ci images.

Closes #4358

(cherry picked from commit 73319ae8bfcdabda01277d085150ad08c21b7c6d)
---
 .travis.mk                        | 22 ++++++++++++++++------
 test/engine/replica_join.skipcond |  7 +++++++
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 test/engine/replica_join.skipcond

diff --git a/.travis.mk b/.travis.mk
index bfb3016da..e5112ef30 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -4,6 +4,7 @@
 
 DOCKER_IMAGE?=packpack/packpack:debian-stretch
 TEST_RUN_EXTRA_PARAMS?=
+MAX_FILES?=65534
 
 all: package
 
@@ -115,12 +116,21 @@ build_osx:
 
 test_osx_no_deps: build_osx
 	# Increase the maximum number of open file descriptors on macOS
-	sudo sysctl -w kern.maxfiles=20480 || :
-	sudo sysctl -w kern.maxfilesperproc=20480 || :
-	sudo launchctl limit maxfiles 20480 || :
-	ulimit -S -n 20480 || :
-	ulimit -n
-	cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) unit/ app/ app-tap/ box/ box-tap/
+	echo tarantool | sudo -S echo "Initialize sudo for the next commands..." :
+	sudo sysctl -w kern.maxfiles=${MAX_FILES} || echo tarantool | sudo -S sysctl -w kern.maxfiles=${MAX_FILES} || :
+	sysctl -w kern.maxfiles || :
+	sudo sysctl -w kern.maxfilesperproc=${MAX_FILES} || echo tarantool | sudo -S sysctl -w kern.maxfilesperproc=${MAX_FILES} || :
+	sysctl -w kern.maxfilesperproc || :
+	sudo launchctl limit maxfiles ${MAX_FILES} || echo tarantool | sudo -S launchctl limit maxfiles ${MAX_FILES} || :
+	launchctl limit maxfiles || :
+	sudo ulimit -S -n ${MAX_FILES} || echo tarantool | sudo -S ulimit -S -n ${MAX_FILES} || :
+	ulimit -S -n || :
+	sudo ulimit -H -n ${MAX_FILES} || echo tarantool | sudo -S ulimit -H -n ${MAX_FILES} || :
+	ulimit -H -n
+	# temporary excluded replication/ suite with some tests from other suites by issues #4357 and #4370
+	cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \
+		app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \
+		replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/
 
 test_osx: deps_osx test_osx_no_deps
 
diff --git a/test/engine/replica_join.skipcond b/test/engine/replica_join.skipcond
new file mode 100644
index 000000000..56f938312
--- /dev/null
+++ b/test/engine/replica_join.skipcond
@@ -0,0 +1,7 @@
+import platform
+
+# Disabled on OSX due to fail #4370.
+if platform.system() == 'Darwin':
+    self.skip = 1
+
+# vim: set ft=python:
-- 
2.17.1

  parent reply	other threads:[~2019-11-06 11:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-06 11:37 [Tarantool-patches] [PATCH v1 0/3] test: set complete OSX testing on 1.10 Alexander V. Tikhonov
2019-11-06 11:37 ` [Tarantool-patches] [PATCH v1 1/3] Bump libsmall version Alexander V. Tikhonov
2019-11-06 11:37 ` Alexander V. Tikhonov [this message]
2019-11-06 11:37 ` [Tarantool-patches] [PATCH v1 3/3] travis-ci: fix OSX max files limits Alexander V. Tikhonov
2019-11-06 12:57 [Tarantool-patches] [PATCH v1 0/3] test: set complete OSX testing on 1.10 Alexander V. Tikhonov
2019-11-06 12:57 ` [Tarantool-patches] [PATCH v1 2/3] test: need to run all test suites on OSX Alexander V. Tikhonov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=45a010fdac3c440902b81cc5cc8484355b1a0413.1573039651.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [Tarantool-patches] [PATCH v1 2/3] test: need to run all test suites on OSX' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox