<HTML><BODY>Up<br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Вторник, 4 декабря 2018, 11:33 +03:00 от Сергей Воронежский <sergw@tarantool.org>:<br>
<br>
<div id="">
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<base target="_self" href="https://e.mail.ru/">
<div id="style_15439124350000012684_BODY"><div class="class_1544112977">
Updated branch with commit "Fix *.reject file directory"<br>We discussed with Kirill and Vladimir what top for each commit should be 2.1.<br><br><br><div class="mail-quote-collapse"><blockquote style="border-left:1px solid #0857A6;margin:10px;padding:0 0 0 10px;">
Понедельник, 26 ноября 2018, 14:27 +03:00 от Alexander Turenko <<a href="mailto:alexander.turenko@tarantool.org">alexander.turenko@tarantool.org</a>>:<br>
<br>
<div id="">
<div class="js-helper_mailru_css_attribute_postfix js-readmsg-msg_mailru_css_attribute_postfix">
<style></style>
<div>
<div id="style_15432316250000012077_BODY_mailru_css_attribute_postfix">Are not that should be on top of 1.10?<br>
<br>
WBR, Alexander Turenko.<br>
<br>
On Mon, Nov 26, 2018 at 02:18:40PM +0300, Sergei Voronezhskii wrote:<br>
<div class="mail-quote-collapse">> BRANCH: <a href="https://github.com/tarantool/tarantool/tree/sergw/update-test-run" target="_blank" rel=" noopener noreferrer">https://github.com/tarantool/tarantool/tree/sergw/update-test-run</a><br>
> <br>
> Updated branch with new version test-run (fixed problem with file descriptors when use_unix_sockets=True)<br>
> Also rebased on 2.1<br>
> <br>
> <br>
> >Пятница, 16 ноября 2018, 18:41 +03:00 от Alexander Turenko <<a href="//e.mail.ru/compose/?mailto=mailto%3aalexander.turenko@tarantool.org" target="_blank" rel=" noopener noreferrer">alexander.turenko@tarantool.org</a>>:<br>
> ><br>
> >Now LGTM.<br>
> ><br>
> >WBR, Alexander Turenko.<br>
> ><br>
> >On Fri, Nov 16, 2018 at 04:58:21PM +0300, Sergei Voronezhskii wrote:<br>
> >> Build: <a href="https://travis-ci.org/tarantool/tarantool/builds/455965753" target="_blank" rel=" noopener noreferrer">https://travis-ci.org/tarantool/tarantool/builds/455965753</a><br>
> >> >Пятница, 16 ноября 2018, 12:27 +03:00 от Alexander Turenko < <a href="//e.mail.ru/compose/?mailto=mailto%3aalexander.turenko@tarantool.org" target="_blank" rel=" noopener noreferrer">alexander.turenko@tarantool.org</a> >:<br>
> >> ><br>
> >> >Please, investigate errors that were arise in CI:<br>
> >> ><br>
> >> >> TypeError: cleanup() got multiple values for keyword argument 'dirname'<br>
> >> ><br>
> >> > <a href="https://travis-ci.org/tarantool/tarantool/jobs/455877309#L2652" target="_blank" rel=" noopener noreferrer">https://travis-ci.org/tarantool/tarantool/jobs/455877309#L2652</a><br>
> >> > <a href="https://travis-ci.org/tarantool/tarantool/jobs/455877310#L2730" target="_blank" rel=" noopener noreferrer">https://travis-ci.org/tarantool/tarantool/jobs/455877310#L2730</a><br>
> >> Fixed:<br>
> ><br>
> >Ok.<br>
> ><br>
> >> diff --git a/test/replication-py/cluster.test.py b/test/replication-py/cluster.test.py<br>
> >> index 14598b798..b5f59f40f 100644<br>
> >> --- a/test/replication-py/cluster.test.py<br>
> >> +++ b/test/replication-py/cluster.test.py<br>
> >> @@ -209,7 +209,7 @@ master.admin('box.info.vclock[%d] == 2' % replica_id)<br>
> >> <br>
> >> master.admin("box.cfg{ replication = '' }")<br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> <br>
> >> print '-------------------------------------------------------------'<br>
> >> print 'Start a new replica and check that server_id, LSN is re-used'<br>
> >> @@ -238,7 +238,7 @@ master.admin('box.info.vclock[%d] == 2' % replica_id)<br>
> >> replica.admin('box.info.vclock[%d] == 2' % replica_id)<br>
> >> <br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> <br>
> >> print '-------------------------------------------------------------'<br>
> >> print 'JOIN replica to read-only master'<br>
> >> diff --git a/test/replication-py/conflict.test.py b/test/replication-py/conflict.test.py<br>
> >> index 41c6fca73..f40148318 100644<br>
> >> --- a/test/replication-py/conflict.test.py<br>
> >> +++ b/test/replication-py/conflict.test.py<br>
> >> @@ -43,12 +43,12 @@ def parallel_run(cmd1, cmd2, compare):<br>
> >> def prepare_cluster():<br>
> >> print 'reset master-master replication'<br>
> >> master.stop()<br>
> >> - master.cleanup(True)<br>
> >> + master.cleanup()<br>
> >> master.start()<br>
> >> master.admin("box.schema.user.grant('guest', 'replication')", silent=True)<br>
> >> <br>
> >> replica.stop()<br>
> >> - replica.cleanup(True)<br>
> >> + replica.cleanup()<br>
> >> replica.start()<br>
> >> <br>
> >> master.admin("box.cfg{replication='%s'}" % replica.iproto.uri, silent=True)<br>
> >> @@ -114,7 +114,7 @@ check_replication([master, replica])<br>
> >> <br>
> >> # cleanup<br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> server.stop()<br>
> >> -server.cleanup(True)<br>
> >> +server.cleanup()<br>
> >> server.deploy()<br>
> >> diff --git a/test/replication-py/init_storage.test.py b/test/replication-py/init_storage.test.py<br>
> >> index 32b4639f1..4be531f8d 100644<br>
> >> --- a/test/replication-py/init_storage.test.py<br>
> >> +++ b/test/replication-py/init_storage.test.py<br>
> >> @@ -26,7 +26,7 @@ replica.admin('box.space.test:select()')<br>
> >> replica.restart()<br>
> >> replica.admin('box.space.test:select()')<br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> <br>
> >> print '-------------------------------------------------------------'<br>
> >> print 'replica test 2 (must be ok)'<br>
> >> @@ -49,7 +49,7 @@ for i in range(1, 20):<br>
> >> replica.admin('space:get{%d}' % i)<br>
> >> <br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> <br>
> >> print '-------------------------------------------------------------'<br>
> >> print 'reconnect on JOIN/SUBSCRIBE'<br>
> >> @@ -77,7 +77,7 @@ replica.wait_until_started()<br>
> >> print 'ok'<br>
> >> <br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> <br>
> >> server.stop()<br>
> >> server.deploy()<br>
> >> diff --git a/test/replication-py/swap.test.py b/test/replication-py/swap.test.py<br>
> >> index b18940517..98eeeea6d 100644<br>
> >> --- a/test/replication-py/swap.test.py<br>
> >> +++ b/test/replication-py/swap.test.py<br>
> >> @@ -119,6 +119,6 @@ for i in range(REPEAT):<br>
> >> <br>
> >> # Cleanup.<br>
> >> replica.stop()<br>
> >> -replica.cleanup(True)<br>
> >> +replica.cleanup()<br>
> >> server.stop()<br>
> >> server.deploy()<br>
> >> <br>
> >> <br>
> >> ><br>
> >> ><br>
> >> >> RuntimeError: Broken tarantool console handshake<br>
> >> ><br>
> >> > <a href="https://travis-ci.org/tarantool/tarantool/jobs/455877312#L2655" target="_blank" rel=" noopener noreferrer">https://travis-ci.org/tarantool/tarantool/jobs/455877312#L2655</a><br>
> >> Looks like this error is not related.<br>
> >> ><br>
> ><br>
> >Ok.<br>
> ><br>
> >> >WBR, Alexander Turenko.<br>
> >> ><br>
> >> >On Fri, Nov 16, 2018 at 11:58:36AM +0300, Sergei Voronezhskii wrote:<br>
> >> >> * Perform the clean up if param `pre_cleanup = True` in suite.ini.<br>
> >> >> It cleans checkpoints in workdir for tap tests. And for app tests<br>
> >> >> cleans spaces/users/roles/globals/functions and checks count of<br>
> >> >> `box.space._cluster`<br>
> >> >> <br>
> >> >> Fixes #1961<br>
> >> >> ---<br>
> >> >> BRANCH: <a href="https://github.com/tarantool/tarantool/tree/sergw/update-test-run" target="_blank" rel=" noopener noreferrer">https://github.com/tarantool/tarantool/tree/sergw/update-test-run</a><br>
> >> >> ISSUE: <a href="https://github.com/tarantool/tarantool/issues/1961" target="_blank" rel=" noopener noreferrer">https://github.com/tarantool/tarantool/issues/1961</a><br>
> >> >> PR: <a href="https://github.com/tarantool/test-run/pull/124" target="_blank" rel=" noopener noreferrer">https://github.com/tarantool/test-run/pull/124</a><br>
> >> >> test-run | 2 +-<br>
> >> >> 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> >> >> <br>
> >> >> diff --git a/test-run b/test-run<br>
> >> >> index 670f330aa..d804b6a6e 160000<br>
> >> >> --- a/test-run<br>
> >> >> +++ b/test-run<br>
> >> >> @@ -1 +1 @@<br>
> >> >> -Subproject commit 670f330aacaf44bc8b1f969fa0cd5f811c5ceb1b<br>
> >> >> +Subproject commit d804b6a6ead6fec466622435fddf2218966d7c06<br>
> >> >> -- <br>
> >> >> 2.18.0<br>
> >> >> <br>
> >> <br>
> >> <br>
> >> -- <br>
> >> Sergei Voronezhskii<br>
> ><br>
> <br>
> <br>
> -- <br>
> Sergei Voronezhskii<br>
</div><br>
</div>
</div>
</div>
</div>
</blockquote></div>
<br>
<br>-- <br>Сергей Воронежский<br>
</div></div>
<base target="_self" href="https://e.mail.ru/">
</div>
</div>
</div>
</blockquote>
<br>
<br>-- <br>Сергей Воронежский<br></BODY></HTML>