Skip to content

Commit 291c2fe

Browse files
dokshinadokshina
committed
Move common replicasets configuration to helper
1 parent 5ee659c commit 291c2fe

File tree

6 files changed

+36
-140
lines changed

6 files changed

+36
-140
lines changed

‎test/helper.lua‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,35 @@ function helpers.truncate_space_on_cluster(cluster, space_name)
131131
end
132132
end
133133

134+
function helpers.get_test_replicasets()
135+
return {
136+
{
137+
uuid = helpers.uuid('a'),
138+
alias = 'router',
139+
roles = { 'crud-router' },
140+
servers = {
141+
{ instance_uuid = helpers.uuid('a', 1), alias = 'router' },
142+
},
143+
},
144+
{
145+
uuid = helpers.uuid('b'),
146+
alias = 's-1',
147+
roles = { 'customers-storage', 'crud-storage' },
148+
servers = {
149+
{ instance_uuid = helpers.uuid('b', 1), alias = 's1-master' },
150+
{ instance_uuid = helpers.uuid('b', 2), alias = 's1-replica' },
151+
},
152+
},
153+
{
154+
uuid = helpers.uuid('c'),
155+
alias = 's-2',
156+
roles = { 'customers-storage', 'crud-storage' },
157+
servers = {
158+
{ instance_uuid = helpers.uuid('c', 1), alias = 's2-master' },
159+
{ instance_uuid = helpers.uuid('c', 2), alias = 's2-replica' },
160+
},
161+
}
162+
}
163+
end
164+
134165
return helpers

‎test/integration/custom_bucket_id_test.lua‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,7 @@ pgroup:set_before_all(function(g)
1414
datadir = fio.tempdir(),
1515
server_command = helpers.entrypoint('srv_simple_operations'),
1616
use_vshard = true,
17-
replicasets = {
18-
{
19-
uuid = helpers.uuid('a'),
20-
alias = 'router',
21-
roles = { 'crud-router' },
22-
servers = {
23-
{ instance_uuid = helpers.uuid('a', 1), alias = 'router' },
24-
},
25-
},
26-
{
27-
uuid = helpers.uuid('b'),
28-
alias = 's-1',
29-
roles = { 'customers-storage', 'crud-storage' },
30-
servers = {
31-
{ instance_uuid = helpers.uuid('b', 1), alias = 's1-master' },
32-
{ instance_uuid = helpers.uuid('b', 2), alias = 's1-replica' },
33-
},
34-
},
35-
{
36-
uuid = helpers.uuid('c'),
37-
alias = 's-2',
38-
roles = { 'customers-storage', 'crud-storage' },
39-
servers = {
40-
{ instance_uuid = helpers.uuid('c', 1), alias = 's2-master' },
41-
{ instance_uuid = helpers.uuid('c', 2), alias = 's2-replica' },
42-
},
43-
}
44-
},
17+
replicasets = helpers.get_test_replicasets(),
4518
env = {
4619
['ENGINE'] = g.params.engine,
4720
},

‎test/integration/pairs_test.lua‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,7 @@ pgroup:set_before_all(function(g)
1515
datadir = fio.tempdir(),
1616
server_command = helpers.entrypoint('srv_select'),
1717
use_vshard = true,
18-
replicasets = {
19-
{
20-
uuid = helpers.uuid('a'),
21-
alias = 'router',
22-
roles = { 'crud-router' },
23-
servers = {
24-
{ instance_uuid = helpers.uuid('a', 1), alias = 'router' },
25-
},
26-
},
27-
{
28-
uuid = helpers.uuid('b'),
29-
alias = 's-1',
30-
roles = { 'customers-storage' , 'crud-storage' },
31-
servers = {
32-
{ instance_uuid = helpers.uuid('b', 1), alias = 's1-master' },
33-
{ instance_uuid = helpers.uuid('b', 2), alias = 's1-replica' },
34-
},
35-
},
36-
{
37-
uuid = helpers.uuid('c'),
38-
alias = 's-2',
39-
roles = { 'customers-storage', 'crud-storage' },
40-
servers = {
41-
{ instance_uuid = helpers.uuid('c', 1), alias = 's2-master' },
42-
{ instance_uuid = helpers.uuid('c', 2), alias = 's2-replica' },
43-
},
44-
}
45-
},
18+
replicasets = helpers.get_test_replicasets(),
4619
env = {
4720
['ENGINE'] = g.params.engine,
4821
},

‎test/integration/select_test.lua‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,7 @@ pgroup:set_before_all(function(g)
1616
datadir = fio.tempdir(),
1717
server_command = helpers.entrypoint('srv_select'),
1818
use_vshard = true,
19-
replicasets = {
20-
{
21-
uuid = helpers.uuid('a'),
22-
alias = 'router',
23-
roles = { 'crud-router' },
24-
servers = {
25-
{ instance_uuid = helpers.uuid('a', 1), alias = 'router' },
26-
},
27-
},
28-
{
29-
uuid = helpers.uuid('b'),
30-
alias = 's-1',
31-
roles = { 'customers-storage', 'crud-storage' },
32-
servers = {
33-
{ instance_uuid = helpers.uuid('b', 1), alias = 's1-master' },
34-
{ instance_uuid = helpers.uuid('b', 2), alias = 's1-replica' },
35-
},
36-
},
37-
{
38-
uuid = helpers.uuid('c'),
39-
alias = 's-2',
40-
roles = { 'customers-storage', 'crud-storage' },
41-
servers = {
42-
{ instance_uuid = helpers.uuid('c', 1), alias = 's2-master' },
43-
{ instance_uuid = helpers.uuid('c', 2), alias = 's2-replica' },
44-
},
45-
}
46-
},
19+
replicasets = helpers.get_test_replicasets(),
4720
env = {
4821
['ENGINE'] = g.params.engine,
4922
},

‎test/integration/simple_operations_test.lua‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,7 @@ pgroup:set_before_all(function(g)
1414
datadir = fio.tempdir(),
1515
server_command = helpers.entrypoint('srv_simple_operations'),
1616
use_vshard = true,
17-
replicasets = {
18-
{
19-
uuid = helpers.uuid('a'),
20-
alias = 'router',
21-
roles = { 'crud-router' },
22-
servers = {
23-
{ instance_uuid = helpers.uuid('a', 1), alias = 'router' },
24-
},
25-
},
26-
{
27-
uuid = helpers.uuid('b'),
28-
alias = 's-1',
29-
roles = { 'customers-storage', 'crud-storage' },
30-
servers = {
31-
{ instance_uuid = helpers.uuid('b', 1), alias = 's1-master' },
32-
{ instance_uuid = helpers.uuid('b', 2), alias = 's1-replica' },
33-
},
34-
},
35-
{
36-
uuid = helpers.uuid('c'),
37-
alias = 's-2',
38-
roles = { 'customers-storage', 'crud-storage' },
39-
servers = {
40-
{ instance_uuid = helpers.uuid('c', 1), alias = 's2-master' },
41-
{ instance_uuid = helpers.uuid('c', 2), alias = 's2-replica' },
42-
},
43-
}
44-
},
17+
replicasets = helpers.get_test_replicasets(),
4518
env = {
4619
['ENGINE'] = g.params.engine,
4720
},

‎test/integration/truncate_test.lua‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,7 @@ pgroup:set_before_all(function(g)
1313
datadir = fio.tempdir(),
1414
server_command = helpers.entrypoint('srv_select'),
1515
use_vshard = true,
16-
replicasets = {
17-
{
18-
uuid = helpers.uuid('a'),
19-
alias = 'router',
20-
roles = { 'crud-router' },
21-
servers = {
22-
{ instance_uuid = helpers.uuid('a', 1), alias = 'router' },
23-
},
24-
},
25-
{
26-
uuid = helpers.uuid('b'),
27-
alias = 's-1',
28-
roles = { 'customers-storage', 'crud-storage' },
29-
servers = {
30-
{ instance_uuid = helpers.uuid('b', 1), alias = 's1-master' },
31-
{ instance_uuid = helpers.uuid('b', 2), alias = 's1-replica' },
32-
},
33-
},
34-
{
35-
uuid = helpers.uuid('c'),
36-
alias = 's-2',
37-
roles = { 'customers-storage', 'crud-storage' },
38-
servers = {
39-
{ instance_uuid = helpers.uuid('c', 1), alias = 's2-master' },
40-
{ instance_uuid = helpers.uuid('c', 2), alias = 's2-replica' },
41-
},
42-
}
43-
},
16+
replicasets = helpers.get_test_replicasets(),
4417
env = {
4518
['ENGINE'] = g.params.engine,
4619
},

0 commit comments

Comments
 (0)