From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 32C5D252C0 for ; Wed, 6 Jun 2018 11:57:34 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BELcbb-RjiB7 for ; Wed, 6 Jun 2018 11:57:34 -0400 (EDT) Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 821F6251DE for ; Wed, 6 Jun 2018 11:57:33 -0400 (EDT) From: AKhatskevich Subject: [tarantool-patches] [PATCH 1/3] Fix test on bucket_transferring error Date: Wed, 6 Jun 2018 18:57:12 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org --- test/router/router.result | 12 ++++++------ test/router/router.test.lua | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/router/router.result b/test/router/router.result index 101369a..5f3ceca 100644 --- a/test/router/router.result +++ b/test/router/router.result @@ -328,17 +328,17 @@ test_run:cmd('switch storage_2_a') --- - true ... -box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING, ''}) --- -- [1, 'sending'] +- [1, 'sending', ''] ... test_run:cmd('switch storage_1_a') --- - true ... -box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING, ''}) --- -- [1, 'receiving'] +- [1, 'receiving', ''] ... test_run:cmd('switch router_1') --- @@ -353,7 +353,7 @@ vshard.router.call(1, 'read', 'echo', {123}) util.check_error(vshard.router.call, 1, 'write', 'echo', {123}) --- - null -- {'type': 'ShardingError', 'code': 7, 'bucket_id': 1} +- {'type': 'ShardingError', 'bucket_id': 1, 'code': 7, 'destination': ''} ... test_run:cmd('switch storage_2_a') --- @@ -369,7 +369,7 @@ test_run:cmd('switch storage_1_a') ... box.space._bucket:delete({1}) --- -- [1, 'receiving'] +- [1, 'receiving', ''] ... test_run:cmd('switch router_1') --- diff --git a/test/router/router.test.lua b/test/router/router.test.lua index 62d6730..fae8e24 100644 --- a/test/router/router.test.lua +++ b/test/router/router.test.lua @@ -119,9 +119,9 @@ replicaset, err = vshard.router.bucket_discovery(1); return err == nil or err replicaset, err = vshard.router.bucket_discovery(2); return err == nil or err test_run:cmd('switch storage_2_a') -box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING, 'cbf06940-0790-498b-948d-042b62cf3d29'}) test_run:cmd('switch storage_1_a') -box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING, 'ac522f65-aa94-4134-9f64-51ee384f1a54'}) test_run:cmd('switch router_1') -- Ok to read sending bucket. vshard.router.call(1, 'read', 'echo', {123}) -- 2.14.1