Skip to content

Commit

Permalink
ci: bump test-run
Browse files Browse the repository at this point in the history
In the near future we plan to test Tarantool installed from a DEB/RPM
package. Since 3.0.0-alpha1 release Tarantool packages don't have
the tarantoolctl utility inside.

tarantoolctl was ebmed to the test-run project inself.
The submodule has been updated to the latest version.

Part of tarantool/tarantool#9443

NO_DOC=bump
NO_TEST=bump
  • Loading branch information
0x501D authored and Gerold103 committed Jan 24, 2024
1 parent ab573e5 commit f119267
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 14 deletions.
1 change: 0 additions & 1 deletion example/router.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ cfg = dofile('localcfg.lua')
if arg[1] == 'discovery_disable' then
cfg.discovery_mode = 'off'
end
cfg.listen = 3300

-- Start the database with sharding
vshard = require('vshard')
Expand Down
7 changes: 1 addition & 6 deletions test/failover/router_1.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,19 @@ local names = dofile('names.lua')
log = require('log')
rs_uuid = names.rs_uuid
replica_uuid = names.replica_uuid
local port
zone = nil
if name == 'router_1' then
port = 3333
zone = 1
elseif name == 'router_2' then
port = 3334
zone = 2
elseif name == 'router_3' then
port = 3335
zone = 3
else
port = 3336
zone = 4
end
cfg.zone = zone

box.cfg{listen = port}
box.cfg{}

function wait_state(state)
log.info(string.rep('a', 1000))
Expand Down
3 changes: 1 addition & 2 deletions test/misc/bad_uuid_router.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ require('console').listen(os.getenv('ADMIN'))

-- Call a configuration provider
cfg = require('bad_uuid_config').cfg
cfg.listen = 3300

-- Start the database with sharding
vshard = require('vshard')
util = require('util')
vshard.router.cfg(cfg)
box.cfg{listen = 3300}
box.cfg{}
2 changes: 1 addition & 1 deletion test/rebalancer/router_1.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vshard = require('vshard')
os = require('os')
fiber = require('fiber')

box.cfg{listen = 3333}
box.cfg{}
vshard.router.cfg(cfg)

require('console').listen(os.getenv('ADMIN'))
1 change: 0 additions & 1 deletion test/router/router_2.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env tarantool
cfg = dofile('config.lua')
cfg.listen = 3300
require('console').listen(os.getenv('ADMIN'))
vshard = require('vshard')
vshard.router.cfg(cfg)
3 changes: 1 addition & 2 deletions test/router/router_3.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env tarantool
fiber = require('fiber')
cfg = dofile('config.lua')
cfg.listen = 3300
require('console').listen(os.getenv('ADMIN'))
vshard = require('vshard')
box.cfg{listen = cfg.listen}
box.cfg{}

0 comments on commit f119267

Please sign in to comment.