Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: kostja@tarantool.org
Cc: tarantool-patches@freelists.org
Subject: [PATCH v3 3/3] Revert "test: skip ddl test for vinyl on travis"
Date: Thu, 28 Mar 2019 19:17:50 +0300	[thread overview]
Message-ID: <01d73c1ef5a80ea710ddcbb8ce63f0ef7edd3d67.1553789818.git.vdavydov.dev@gmail.com> (raw)
In-Reply-To: <cover.1553789818.git.vdavydov.dev@gmail.com>
In-Reply-To: <cover.1553789818.git.vdavydov.dev@gmail.com>

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

  parent reply	other threads:[~2019-03-28 16:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-28 16:17 [PATCH v3 0/3] Fix DML vs DDL race Vladimir Davydov
2019-03-28 16:17 ` [PATCH v3 1/3] vinyl: make tx_manager_abort_writers_for_ddl more thorough Vladimir Davydov
2019-03-28 16:17 ` [PATCH v3 2/3] vinyl: abort affected transactions when space is removed from cache Vladimir Davydov
2019-03-28 16:17 ` Vladimir Davydov [this message]
2019-03-28 17:53 ` [PATCH v3 0/3] Fix DML vs DDL race Vladimir Davydov

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=01d73c1ef5a80ea710ddcbb8ce63f0ef7edd3d67.1553789818.git.vdavydov.dev@gmail.com \
    --to=vdavydov.dev@gmail.com \
    --cc=kostja@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [PATCH v3 3/3] Revert "test: skip ddl test for vinyl on travis"' \
    /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