* [Tarantool-patches] [PATCH 1/1] test: fix test for #4672
@ 2019-12-19 14:56 imeevma
2019-12-19 15:04 ` Alexander Tikhonov
2019-12-29 17:54 ` Alexander Turenko
0 siblings, 2 replies; 3+ messages in thread
From: imeevma @ 2019-12-19 14:56 UTC (permalink / raw)
To: kyukhin; +Cc: tarantool-patches
---
https://github.com/tarantool/tarantool/tree/imeevma/gh-4672-fix-test-for-1.10
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 f4d7adb..a9540d9 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 f718a56..fcabb3a 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')
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Tarantool-patches] [PATCH 1/1] test: fix test for #4672
2019-12-19 14:56 [Tarantool-patches] [PATCH 1/1] test: fix test for #4672 imeevma
@ 2019-12-19 15:04 ` Alexander Tikhonov
2019-12-29 17:54 ` Alexander Turenko
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Tikhonov @ 2019-12-19 15:04 UTC (permalink / raw)
To: imeevma; +Cc: tarantool-patches
[-- Attachment #1: Type: text/plain, Size: 2808 bytes --]
Mergen,
Thanks for your fast patch, for me it looks correct and testing passed too, so LGTM.
>Четверг, 19 декабря 2019, 17:56 +03:00 от imeevma@tarantool.org:
>
>---
>https://github.com/tarantool/tarantool/tree/imeevma/gh-4672-fix-test-for-1.10
>
> 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 f4d7adb..a9540d9 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 f718a56..fcabb3a 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')
>--
>2.7.4
>
--
Alexander Tikhonov
[-- Attachment #2: Type: text/html, Size: 3791 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Tarantool-patches] [PATCH 1/1] test: fix test for #4672
2019-12-19 14:56 [Tarantool-patches] [PATCH 1/1] test: fix test for #4672 imeevma
2019-12-19 15:04 ` Alexander Tikhonov
@ 2019-12-29 17:54 ` Alexander Turenko
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Turenko @ 2019-12-29 17:54 UTC (permalink / raw)
To: Mergen Imeev; +Cc: tarantool-patches
I rewrote the commit message and pushed it to master, 2.2 and 1.10.
The new commit message:
| 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>
WBR, Alexander Turenko.
> test: fix test for #4672
Please, don't include an issue number into a commit header. A header
should describe what is changed in brief rather then provide tracking
information.
On Thu, Dec 19, 2019 at 05:56:57PM +0300, imeevma@tarantool.org wrote:
> ---
> https://github.com/tarantool/tarantool/tree/imeevma/gh-4672-fix-test-for-1.10
>
> 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 f4d7adb..a9540d9 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 f718a56..fcabb3a 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')
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-29 17:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-19 14:56 [Tarantool-patches] [PATCH 1/1] test: fix test for #4672 imeevma
2019-12-19 15:04 ` Alexander Tikhonov
2019-12-29 17:54 ` Alexander Turenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox