From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladimir Davydov Subject: [PATCH v3 3/3] Revert "test: skip ddl test for vinyl on travis" Date: Thu, 28 Mar 2019 19:17:50 +0300 Message-Id: <01d73c1ef5a80ea710ddcbb8ce63f0ef7edd3d67.1553789818.git.vdavydov.dev@gmail.com> In-Reply-To: References: In-Reply-To: References: To: kostja@tarantool.org Cc: tarantool-patches@freelists.org List-ID: This reverts commit c2de45c4686405d199eb22273706a3d52cadea3b. Not needed anymore as the DDL bug it was supposed to work around has been finally fixed. Follow-up #3420 --- rpm/tarantool.spec | 2 -- test/vinyl/ddl.skipcond | 6 ------ 2 files changed, 8 deletions(-) delete mode 100644 test/vinyl/ddl.skipcond diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index bd2469d9..c87b1667 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -149,8 +149,6 @@ rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/ echo "self.skip = True" > ./test/app/socket.skipcond # https://github.com/tarantool/tarantool/issues/1322 echo "self.skip = True" > ./test/app/digest.skipcond -# https://github.com/tarantool/tarantool/issues/3420 -echo "self.skip = True" > ./test/vinyl/ddl.skipcond # run a safe subset of the test suite cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/ %endif diff --git a/test/vinyl/ddl.skipcond b/test/vinyl/ddl.skipcond deleted file mode 100644 index 3ef55854..00000000 --- a/test/vinyl/ddl.skipcond +++ /dev/null @@ -1,6 +0,0 @@ -# vim: set ft=python : -import os - -# Travis CI fails because of bug #3420 -if os.environ.get('TRAVIS_JOB_ID', False): - self.skip = 1 -- 2.11.0