[tarantool-patches] [PATCH] test: skip ddl test for vinyl on travis

Alexander Turenko alexander.turenko at tarantool.org
Mon Sep 17 21:11:19 MSK 2018


Hi!

See comments below.

WBR, Alexander Turenko.

On Mon, Sep 17, 2018 at 08:42:02PM +0300, Sergei Voronezhskii wrote:
> Until the bug in #3420 is fixed
> ---
> branch: sergw/travis-skip-test-ddl
>  .travis.mk              | 1 +
>  rpm/tarantool.spec      | 2 ++
>  test/vinyl/ddl.skipcond | 6 ++++++
>  3 files changed, 9 insertions(+)
>  create mode 100644 test/vinyl/ddl.skipcond
> 
> diff --git a/.travis.mk b/.travis.mk
> index 23f804cde..795493855 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -26,6 +26,7 @@ docker_%:
>  		-e XDG_CACHE_HOME=/cache \
>  		-e CCACHE_DIR=/cache/ccache \
>  		-e COVERALLS_TOKEN=${COVERALLS_TOKEN} \
> +		-e TRAVIS=${TRAVIS} \
>  		-e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} \

We can just use TRAVIS_JOB_ID, are we don't? I think we should not
overuse environment customization facilities and even avoid it where
possible.

>  		${DOCKER_IMAGE} \
>  		make -f .travis.mk $(subst docker_,,$@)
> diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
> index c87b1667d..bd2469d90 100644
> --- a/rpm/tarantool.spec
> +++ b/rpm/tarantool.spec
> @@ -149,6 +149,8 @@ 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

Ok.

It should not be part of this patch, but can you elaborate whether we
can remove two skipconds above? Maybe it worth to file a separate issue
for that.

>  # 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
> new file mode 100644
> index 000000000..ad20eb2b4
> --- /dev/null
> +++ b/test/vinyl/ddl.skipcond
> @@ -0,0 +1,6 @@
> +# vim: set ft=python :
> +import os
> +
> +# Travis CI fails because of bud #3420
> +if os.environ.get('TRAVIS', False):
> +    self.skip = 1

Here we can check TRAVIS_JOB_ID.

And I guess that non-working http_client.skipcond can be removed now.

> -- 
> 2.18.0
> 
> 



More information about the Tarantool-patches mailing list