Re[3]: [PATCH] test: update test-run

["Сергей Воронежский" <sergw@tarantool.org>]

[-- Attachment #1: Type: text/plain, Size: 6794 bytes --]

Up


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


-- 
Сергей Воронежский

[-- Attachment #2: Type: text/html, Size: 11329 bytes --]