Skip to content

Commit 0834a2d

Browse files
DifferentialOrangeDifferentialOrange
committed
test: do not rely on replication in more read cases
Some read cases were missing in #404, #406 and #408 test stabilization commits. This patch updates missing read cases. 1. https://github.com/tarantool/crud/actions/runs/7322196516/job/19943422319 Follows #404
1 parent 5ce952d commit 0834a2d

File tree

7 files changed

+130
-77
lines changed

7 files changed

+130
-77
lines changed

‎test/doc/playground_test.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ end
6161

6262
local cases = {
6363
test_select_customers = {
64-
request = "crud.select('customers', {{'<=', 'age', 35}}, {first = 10})",
64+
request = "crud.select('customers', {{'<=', 'age', 35}}, {first = 10, mode = 'write'})",
6565
retval_1 = {
6666
metadata = {
6767
{name = 'id', type = 'unsigned'},
@@ -79,7 +79,7 @@ local cases = {
7979
}
8080
},
8181
test_select_developers = {
82-
request = "crud.select('developers', nil, {first = 6})",
82+
request = "crud.select('developers', nil, {first = 6, mode = 'write'})",
8383
retval_1 = {
8484
metadata = {
8585
{name = 'id', type = 'unsigned'},
@@ -117,7 +117,7 @@ local cases = {
117117
test_error = {
118118
request = [[
119119
do
120-
local res, err = crud.select('non_existent', nil, {first = 10})
120+
local res, err = crud.select('non_existent', nil, {first = 10, mode = 'write'})
121121
return res, err and err.err or nil
122122
end
123123
]],

‎test/integration/borders_test.lua

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,83 +26,103 @@ end)
2626

2727
pgroup.test_non_existent_space = function(g)
2828
-- min
29-
local result, err = g.cluster.main_server.net_box:call(
30-
'crud.min', {'non_existent_space'}
31-
)
29+
local result, err = g.cluster.main_server.net_box:call('crud.min', {
30+
'non_existent_space',
31+
nil,
32+
{mode = 'write'},
33+
})
3234

3335
t.assert_equals(result, nil)
3436
t.assert_str_contains(err.err, "Space \"non_existent_space\" doesn't exist")
3537

3638
-- max
37-
local result, err = g.cluster.main_server.net_box:call(
38-
'crud.max', {'non_existent_space'}
39-
)
39+
local result, err = g.cluster.main_server.net_box:call('crud.max', {
40+
'non_existent_space',
41+
nil,
42+
{mode = 'write'},
43+
})
4044

4145
t.assert_equals(result, nil)
4246
t.assert_str_contains(err.err, "Space \"non_existent_space\" doesn't exist")
4347
end
4448

4549
pgroup.test_non_existent_index = function(g)
4650
-- min
47-
local result, err = g.cluster.main_server.net_box:call(
48-
'crud.min', {'customers', 'non_existent_index'}
49-
)
51+
local result, err = g.cluster.main_server.net_box:call('crud.min', {
52+
'customers',
53+
'non_existent_index',
54+
{mode = 'write'},
55+
})
5056

5157
t.assert_equals(result, nil)
5258
t.assert_str_contains(err.err, "Index \"non_existent_index\" of space \"customers\" doesn't exist")
5359

54-
local result, err = g.cluster.main_server.net_box:call(
55-
'crud.min', {'customers', 13}
56-
)
60+
local result, err = g.cluster.main_server.net_box:call('crud.min', {
61+
'customers',
62+
13,
63+
{mode = 'write'},
64+
})
5765

5866
t.assert_equals(result, nil)
5967
t.assert_str_contains(err.err, "Index \"13\" of space \"customers\" doesn't exist")
6068

6169
-- max
62-
local result, err = g.cluster.main_server.net_box:call(
63-
'crud.max', {'customers', 'non_existent_index'}
64-
)
70+
local result, err = g.cluster.main_server.net_box:call('crud.max', {
71+
'customers',
72+
'non_existent_index',
73+
{mode = 'write'},
74+
})
6575

6676
t.assert_equals(result, nil)
6777
t.assert_str_contains(err.err, "Index \"non_existent_index\" of space \"customers\" doesn't exist")
6878

69-
local result, err = g.cluster.main_server.net_box:call(
70-
'crud.max', {'customers', 13}
71-
)
79+
local result, err = g.cluster.main_server.net_box:call('crud.max', {
80+
'customers',
81+
13,
82+
{mode = 'write'},
83+
})
7284

7385
t.assert_equals(result, nil)
7486
t.assert_str_contains(err.err, "Index \"13\" of space \"customers\" doesn't exist")
7587
end
7688

7789
pgroup.test_empty_space = function(g)
7890
-- min
79-
local result, err = g.cluster.main_server.net_box:call(
80-
'crud.min', {'customers'}
81-
)
91+
local result, err = g.cluster.main_server.net_box:call('crud.min', {
92+
'customers',
93+
nil,
94+
{mode = 'write'},
95+
})
8296

8397
t.assert_equals(err, nil)
8498
t.assert_equals(#result.rows, 0)
8599

86100
-- min by age index with fields
87-
local result, err = g.cluster.main_server.net_box:call(
88-
'crud.min', {'customers', 'age_index', {fields = {'name'}}}
89-
)
101+
local result, err = g.cluster.main_server.net_box:call('crud.min', {
102+
'customers',
103+
'age_index',
104+
{fields = {'name'}, mode = 'write'},
105+
})
90106

91107
t.assert_equals(err, nil)
92108
t.assert_equals(#result.rows, 0)
93109

94110
-- max
95-
local result, err = g.cluster.main_server.net_box:call(
96-
'crud.max', {'customers'}
97-
)
111+
local result, err = g.cluster.main_server.net_box:call('crud.max', {
112+
'customers',
113+
nil,
114+
{mode = 'write'},
115+
})
98116

99117
t.assert_equals(err, nil)
100118
t.assert_equals(#result.rows, 0)
101119

102120
-- max by age index with fields
103-
local result, err = g.cluster.main_server.net_box:call(
104-
'crud.max', {'customers', 'age_index', {fields = {'name'}}}
105-
)
121+
local result, err = g.cluster.main_server.net_box:call('crud.max', {
122+
'customers',
123+
'age_index',
124+
{fields = {'name'}, mode = 'write'},
125+
})
106126

107127
t.assert_equals(err, nil)
108128
t.assert_equals(#result.rows, 0)

‎test/integration/count_test.lua

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,22 @@ pgroup.before_each(function(g)
3232
end)
3333

3434
pgroup.test_count_non_existent_space = function(g)
35-
local result, err = g.cluster.main_server.net_box:call('crud.count', {'non_existent_space', nil, {fullscan = true}})
35+
local result, err = g.cluster.main_server.net_box:call('crud.count', {
36+
'non_existent_space',
37+
nil,
38+
{fullscan = true, mode = 'write'},
39+
})
3640

3741
t.assert_equals(result, nil)
3842
t.assert_str_contains(err.err, "Space \"non_existent_space\" doesn't exist")
3943
end
4044

4145
pgroup.test_count_empty_space = function(g)
42-
local result, err = g.cluster.main_server.net_box:call('crud.count', {'customers', nil, {fullscan = true}})
46+
local result, err = g.cluster.main_server.net_box:call('crud.count', {
47+
'customers',
48+
nil,
49+
{fullscan = true, mode = 'write'},
50+
})
4351

4452
t.assert_equals(err, nil)
4553
t.assert_equals(result, 0)
@@ -50,9 +58,11 @@ pgroup.test_not_valid_value_type = function(g)
5058
{'==', 'id', 'not_number'}
5159
}
5260

53-
local result, err = g.cluster.main_server.net_box:call('crud.count',
54-
{'customers', conditions}
55-
)
61+
local result, err = g.cluster.main_server.net_box:call('crud.count', {
62+
'customers',
63+
conditions,
64+
{mode = 'write'},
65+
})
5666

5767
t.assert_equals(result, nil)
5868
t.assert_str_contains(err.err, "Supplied key type of part 0 does not match index part type: expected unsigned")
@@ -63,9 +73,11 @@ pgroup.test_not_valid_operation = function(g)
6373
{{}, 'id', 5}
6474
}
6575

66-
local result, err = g.cluster.main_server.net_box:call('crud.count',
67-
{'customers', conditions, {fullscan = true}}
68-
)
76+
local result, err = g.cluster.main_server.net_box:call('crud.count', {
77+
'customers',
78+
conditions,
79+
{fullscan = true, mode = 'write'},
80+
})
6981

7082
t.assert_equals(result, nil)
7183
t.assert_str_contains(err.err, "Failed to parse conditions")
@@ -76,9 +88,11 @@ pgroup.test_conditions_with_non_existed_field = function(g)
7688
{'==', 'non_existed_field', 'value'}
7789
}
7890

79-
local result, err = g.cluster.main_server.net_box:call('crud.count',
80-
{'customers', conditions}
81-
)
91+
local result, err = g.cluster.main_server.net_box:call('crud.count', {
92+
'customers',
93+
conditions,
94+
{mode = 'write'},
95+
})
8296

8397
t.assert_equals(err, nil)
8498
t.assert_equals(result, 0)

‎test/integration/pairs_test.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ pgroup.test_pairs_partial_result = function(g)
418418
local conditions, fields = ...
419419
420420
local tuples = {}
421-
for _, tuple in crud.pairs('customers', conditions, {fields = fields}) do
421+
for _, tuple in crud.pairs('customers', conditions, {fields = fields, mode = 'write'}) do
422422
table.insert(tuples, tuple)
423423
end
424424

‎test/integration/select_test.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ end)
3838
pgroup.test_non_existent_space = function(g)
3939
-- insert
4040
local obj, err = g.cluster.main_server.net_box:call('crud.select', {
41-
'non_existent_space', nil, {fullscan = true},
41+
'non_existent_space',
42+
nil,
43+
{fullscan = true, mode = 'write'},
4244
})
4345

4446
t.assert_equals(obj, nil)
@@ -47,7 +49,9 @@ end
4749

4850
pgroup.test_select_no_index = function(g)
4951
local obj, err = g.cluster.main_server.net_box:call('crud.select', {
50-
'no_index_space', nil, {fullscan = true},
52+
'no_index_space',
53+
nil,
54+
{fullscan = true, mode = 'write'},
5155
})
5256

5357
t.assert_equals(obj, nil)

0 commit comments

Comments
 (0)