* [PATCH] test: skip ddl test for vinyl on travis
@ 2018-09-17 12:38 Sergei Voronezhskii
2018-09-17 17:42 ` Sergei Voronezhskii
2018-09-21 14:04 ` [tarantool-patches] [PATCH] " Kirill Yukhin
0 siblings, 2 replies; 7+ messages in thread
From: Sergei Voronezhskii @ 2018-09-17 12:38 UTC (permalink / raw)
To: tarantool-patches; +Cc: Vladimir Davydov
Until the bug in #3420 is fixed
---
branch: sergw/travis-skip-test-ddl
test/vinyl/ddl.skipcond | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 test/vinyl/ddl.skipcond
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
--
2.18.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] test: skip ddl test for vinyl on travis
2018-09-17 12:38 [PATCH] test: skip ddl test for vinyl on travis Sergei Voronezhskii
@ 2018-09-17 17:42 ` Sergei Voronezhskii
2018-09-17 18:11 ` [tarantool-patches] " Alexander Turenko
2018-09-21 14:04 ` [tarantool-patches] [PATCH] " Kirill Yukhin
1 sibling, 1 reply; 7+ messages in thread
From: Sergei Voronezhskii @ 2018-09-17 17:42 UTC (permalink / raw)
To: tarantool-patches; +Cc: Vladimir Davydov
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} \
${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
# 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
--
2.18.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [tarantool-patches] [PATCH] test: skip ddl test for vinyl on travis
2018-09-17 17:42 ` Sergei Voronezhskii
@ 2018-09-17 18:11 ` Alexander Turenko
2018-09-18 13:47 ` [PATCH v2] " Sergei Voronezhskii
0 siblings, 1 reply; 7+ messages in thread
From: Alexander Turenko @ 2018-09-17 18:11 UTC (permalink / raw)
To: Sergei Voronezhskii; +Cc: tarantool-patches, Vladimir Davydov
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
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] test: skip ddl test for vinyl on travis
2018-09-17 18:11 ` [tarantool-patches] " Alexander Turenko
@ 2018-09-18 13:47 ` Sergei Voronezhskii
2018-09-19 16:14 ` Alexander Turenko
0 siblings, 1 reply; 7+ messages in thread
From: Sergei Voronezhskii @ 2018-09-18 13:47 UTC (permalink / raw)
To: tarantool-patches; +Cc: Alexander Turenko, Vladimir Davydov
Until the bug in #3420 is fixed
---
branch: sergw/travis-skip-test-ddl
rpm/tarantool.spec | 2 ++
test/vinyl/ddl.skipcond | 6 ++++++
2 files changed, 8 insertions(+)
create mode 100644 test/vinyl/ddl.skipcond
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
# 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..d7938a443
--- /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_JOB_ID', False):
+ self.skip = 1
--
2.18.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] test: skip ddl test for vinyl on travis
2018-09-18 13:47 ` [PATCH v2] " Sergei Voronezhskii
@ 2018-09-19 16:14 ` Alexander Turenko
2018-09-20 8:20 ` Re[2]: " Sergei Voronezhskii
0 siblings, 1 reply; 7+ messages in thread
From: Alexander Turenko @ 2018-09-19 16:14 UTC (permalink / raw)
To: Sergei Voronezhskii; +Cc: tarantool-patches, Vladimir Davydov
Hi!
LGTM.
WBR, Alexander Turenko.
On Tue, Sep 18, 2018 at 04:47:25PM +0300, Sergei Voronezhskii wrote:
> Until the bug in #3420 is fixed
> ---
>
> branch: sergw/travis-skip-test-ddl
> rpm/tarantool.spec | 2 ++
> test/vinyl/ddl.skipcond | 6 ++++++
> 2 files changed, 8 insertions(+)
> create mode 100644 test/vinyl/ddl.skipcond
>
> 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
> # 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..d7938a443
> --- /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_JOB_ID', False):
> + self.skip = 1
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re[2]: [PATCH v2] test: skip ddl test for vinyl on travis
2018-09-19 16:14 ` Alexander Turenko
@ 2018-09-20 8:20 ` Sergei Voronezhskii
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Voronezhskii @ 2018-09-20 8:20 UTC (permalink / raw)
To: Alexander Turenko; +Cc: tarantool-patches, Vladimir Davydov
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
Fixed typo s/bud/bug/
>Среда, 19 сентября 2018, 19:14 +03:00 от Alexander Turenko <alexander.turenko@tarantool.org>:
>
>Hi!
>
>LGTM.
>
>WBR, Alexander Turenko.
>
>On Tue, Sep 18, 2018 at 04:47:25PM +0300, Sergei Voronezhskii wrote:
>> Until the bug in #3420 is fixed
>> ---
>>
>> branch: sergw/travis-skip-test-ddl
>> rpm/tarantool.spec | 2 ++
>> test/vinyl/ddl.skipcond | 6 ++++++
>> 2 files changed, 8 insertions(+)
>> create mode 100644 test/vinyl/ddl.skipcond
>>
>> 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
>> # 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..d7938a443
>> --- /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_JOB_ID', False):
>> + self.skip = 1
>> --
>> 2.18.0
>>
--
Sergei Voronezhskii
[-- Attachment #2: Type: text/html, Size: 2467 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [tarantool-patches] [PATCH] test: skip ddl test for vinyl on travis
2018-09-17 12:38 [PATCH] test: skip ddl test for vinyl on travis Sergei Voronezhskii
2018-09-17 17:42 ` Sergei Voronezhskii
@ 2018-09-21 14:04 ` Kirill Yukhin
1 sibling, 0 replies; 7+ messages in thread
From: Kirill Yukhin @ 2018-09-21 14:04 UTC (permalink / raw)
To: tarantool-patches; +Cc: Vladimir Davydov
Hello,
On 17 сен 15:38, Sergei Voronezhskii wrote:
> Until the bug in #3420 is fixed
> ---
> branch: sergw/travis-skip-test-ddl
I've checked your patch into 1.10 branch.
--
Regards, Kirill Yukhin
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-09-21 14:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-17 12:38 [PATCH] test: skip ddl test for vinyl on travis Sergei Voronezhskii
2018-09-17 17:42 ` Sergei Voronezhskii
2018-09-17 18:11 ` [tarantool-patches] " Alexander Turenko
2018-09-18 13:47 ` [PATCH v2] " Sergei Voronezhskii
2018-09-19 16:14 ` Alexander Turenko
2018-09-20 8:20 ` Re[2]: " Sergei Voronezhskii
2018-09-21 14:04 ` [tarantool-patches] [PATCH] " Kirill Yukhin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox