Skip to content

test: fix compatibility with Tarantool master #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.

### Fixed

- crud tests with Tarantool 3.0 (#293)

## [1.11.0] - 2023-05-18

The release adds pagination support and wrappers for the
Expand Down
16 changes: 13 additions & 3 deletions crud/testdata/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,22 @@ box.once('guest', function()
box.schema.user.grant('guest', 'super')
end)
local uri = 'guest@127.0.0.1:3013'
local box_info = box.info()

local replicaset_uuid
if box_info.replicaset then
-- Since Tarantool 3.0.
replicaset_uuid = box_info.replicaset.uuid
else
replicaset_uuid = box_info.cluster.uuid
end

local cfg = {
bucket_count = 300,
sharding = {
[box.info().cluster.uuid] = {
[replicaset_uuid] = {
replicas = {
[box.info().uuid] = {
[box_info.uuid] = {
uri = uri,
name = 'storage',
master = true,
Expand All @@ -89,7 +99,7 @@ local cfg = {
},
},
}
vshard.storage.cfg(cfg, box.info().uuid)
vshard.storage.cfg(cfg, box_info.uuid)
vshard.router.cfg(cfg)
vshard.router.bootstrap()

Expand Down