From 7c4b4f0281d7d324f7e857846db6c9fb3df2e353 Mon Sep 17 00:00:00 2001 From: Mergen Imeev <imeevma@gmail.com> Date: Thu, 19 Dec 2019 17:47:34 +0300 Subject: [PATCH] test: trim field name update from serializer test The test re encoding of -2^63 Lua number value did use update by a field name, which does not supported in 1.10 and 2.2 branches. Field name updates are orthogonal to Lua number serialization and we don't intend to test them here. So it is safe and logical to get rid of them in the test. This change allow the test to pass on 1.10 and 2.2 branches. Follows up #4672. Reviewed-by: Alexander Tikhonov <avtikhon@tarantool.org> Reviewed-by: Alexander Turenko <alexander.turenko@tarantool.org> (cherry picked from commit 408b9ad4a0a1ec1389709358bf308b4527e970d6) --- test/box/gh-4672-min-integer-value-in-serializer.result | 8 ++++---- test/box/gh-4672-min-integer-value-in-serializer.test.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/box/gh-4672-min-integer-value-in-serializer.result b/test/box/gh-4672-min-integer-value-in-serializer.result index f4d7adb4d3..a9540d905c 100644 --- a/test/box/gh-4672-min-integer-value-in-serializer.result +++ b/test/box/gh-4672-min-integer-value-in-serializer.result @@ -36,7 +36,7 @@ s:insert({3, 0}) | --- | - [3, 0] | ... -s:update(3, {{'=', 'i', -2^63}}) +s:update(3, {{'=', 2, -2^63}}) | --- | - [3, -9223372036854775808] | ... @@ -44,7 +44,7 @@ s:insert({4, 0}) | --- | - [4, 0] | ... -s:update(4, {{'=', 'i', -9223372036854775808LL}}) +s:update(4, {{'=', 2, -9223372036854775808LL}}) | --- | - [4, -9223372036854775808] | ... @@ -72,7 +72,7 @@ s:insert({13, 0}) | --- | - [13, 0] | ... -s:update(13, {{'=', 'i', -2^63}}) +s:update(13, {{'=', 2, -2^63}}) | --- | - [13, -9223372036854775808] | ... @@ -80,7 +80,7 @@ s:insert({14, 0}) | --- | - [14, 0] | ... -s:update(14, {{'=', 'i', -9223372036854775808LL}}) +s:update(14, {{'=', 2, -9223372036854775808LL}}) | --- | - [14, -9223372036854775808] | ... diff --git a/test/box/gh-4672-min-integer-value-in-serializer.test.lua b/test/box/gh-4672-min-integer-value-in-serializer.test.lua index f718a56147..fcabb3ab3d 100644 --- a/test/box/gh-4672-min-integer-value-in-serializer.test.lua +++ b/test/box/gh-4672-min-integer-value-in-serializer.test.lua @@ -14,9 +14,9 @@ _ = s:create_index('ii') s:insert({1, -2^63}) s:insert({2, -9223372036854775808LL}) s:insert({3, 0}) -s:update(3, {{'=', 'i', -2^63}}) +s:update(3, {{'=', 2, -2^63}}) s:insert({4, 0}) -s:update(4, {{'=', 'i', -9223372036854775808LL}}) +s:update(4, {{'=', 2, -9223372036854775808LL}}) box.schema.user.grant('guest', 'read, write', 'space', 'serializer_test_space') @@ -26,9 +26,9 @@ s = cn.space.serializer_test_space s:insert({11, -2^63}) s:insert({12, -9223372036854775808LL}) s:insert({13, 0}) -s:update(13, {{'=', 'i', -2^63}}) +s:update(13, {{'=', 2, -2^63}}) s:insert({14, 0}) -s:update(14, {{'=', 'i', -9223372036854775808LL}}) +s:update(14, {{'=', 2, -9223372036854775808LL}}) cn:close() box.schema.user.revoke('guest', 'read, write', 'space', 'serializer_test_space') -- GitLab