test: refer to storage server by id

Index alias provide stable info on instance nature, yet servers list index doesn't.
tarantool · Jan 23, 2024 · 28d5eab · 28d5eab
1 parent 76d1375
commit 28d5eab
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/test/integration/borders_test.lua b/test/integration/borders_test.lua
@@ -12,7 +12,7 @@ local pgroup = t.group('borders', helpers.backend_matrix({
 pgroup.before_all(function(g)
     helpers.start_default_cluster(g, 'srv_select')
 
-    g.space_format = g.cluster.servers[2].net_box.space.customers:format()
+    g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
 end)
 
 pgroup.after_all(function(g)

diff --git a/test/integration/custom_bucket_id_test.lua b/test/integration/custom_bucket_id_test.lua
@@ -12,7 +12,7 @@ local pgroup = t.group('custom_bucket_id', helpers.backend_matrix({
 pgroup.before_all(function(g)
     helpers.start_default_cluster(g, 'srv_simple_operations')
 
-    g.space_format = g.cluster.servers[2].net_box.space.customers:format()
+    g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
 end)
 
 pgroup.after_all(function(g)

diff --git a/test/integration/pairs_test.lua b/test/integration/pairs_test.lua
@@ -12,7 +12,7 @@ local pgroup = t.group('pairs', helpers.backend_matrix({
 pgroup.before_all(function(g)
     helpers.start_default_cluster(g, 'srv_select')
 
-    g.space_format = g.cluster.servers[2].net_box.space.customers:format()
+    g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
 
     g.cluster.main_server.net_box:eval([[
         require('crud').cfg{ stats = true }

diff --git a/test/integration/select_readview_test.lua b/test/integration/select_readview_test.lua
@@ -15,7 +15,7 @@ local pgroup = t.group('select_readview', helpers.backend_matrix({
 local function init_cluster(g)
     helpers.start_default_cluster(g, 'srv_select')
 
-    g.space_format = g.cluster.servers[2].net_box.space.customers:format()
+    g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
 
     g.router = helpers.get_router(g.cluster, g.params.backend)
     g.router.net_box:eval([[
@@ -2372,7 +2372,7 @@ pgroup.test_select_switch_master = function(g)
     t.assert_equals(err, nil)
 
     local replicasets = helpers.get_test_cartridge_replicasets()
-    set_master(g.cluster, replicasets[2].uuid, replicasets[2].servers[2].instance_uuid)
+    set_master(g.cluster, replicasets[2].uuid, replicasets[2]:server('s1-master').instance_uuid)
 
     local obj, err = g.cluster.main_server.net_box:eval([[
         local crud = require('crud')
@@ -2428,7 +2428,7 @@ pgroup.test_select_switch_master_first = function(g)
     t.assert_equals(objects, helpers.get_objects_by_idxs(customers, {1, 2}))
 
     local replicasets = helpers.get_test_cartridge_replicasets()
-    set_master(g.cluster, replicasets[3].uuid, replicasets[3].servers[2].instance_uuid)
+    set_master(g.cluster, replicasets[3].uuid, replicasets[3]:server('s1-master').instance_uuid)
 
     local obj, err = g.cluster.main_server.net_box:eval([[
         local crud = require('crud')

diff --git a/test/integration/select_test.lua b/test/integration/select_test.lua
@@ -13,7 +13,7 @@ local pgroup = t.group('select', helpers.backend_matrix({
 pgroup.before_all(function(g)
     helpers.start_default_cluster(g, 'srv_select')
 
-    g.space_format = g.cluster.servers[2].net_box.space.customers:format()
+    g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
 
     g.router = helpers.get_router(g.cluster, g.params.backend)
     g.router.net_box:eval([[

diff --git a/test/integration/truncate_test.lua b/test/integration/truncate_test.lua
@@ -10,7 +10,7 @@ local pgroup = t.group('truncate', helpers.backend_matrix({
 pgroup.before_all(function(g)
     helpers.start_default_cluster(g, 'srv_select')
 
-    g.space_format = g.cluster.servers[2].net_box.space.customers:format()
+    g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
 end)
 
 pgroup.after_all(function(g)