Skip to content

Commit 934052b

Browse files
elhimovelhimov
committed
test: debugging
Closes #452
1 parent 20dc742 commit 934052b

File tree

3 files changed

+112
-53
lines changed

3 files changed

+112
-53
lines changed

‎.github/workflows/testing.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ jobs:
273273
cd "${SRCDIR}"
274274
make deps
275275
276+
- name: Setup tmate session
277+
uses: mxschmitt/action-tmate@v3
278+
276279
- name: Run regression tests
277280
run: |
278281
cd "${SRCDIR}"

‎pool/connection_pool_test.go‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,11 +1111,9 @@ func (h *testHandler) Deactivated(name string, conn *tarantool.Connection,
11111111
}
11121112

11131113
func TestConnectionHandlerOpenUpdateClose(t *testing.T) {
1114-
poolServers := []string{servers[0], servers[1]}
1115-
poolInstances := makeInstances(poolServers, connOpts)
1114+
poolInstances := instances[:2]
11161115
roles := []bool{false, true}
1117-
1118-
err := test_helpers.SetClusterRO(makeDialers(poolServers), connOpts, roles)
1116+
err := test_helpers.SetClusterRO(poolInstances, roles)
11191117
require.Nilf(t, err, "fail to set roles for cluster")
11201118

11211119
h := &testHandler{}
@@ -1128,6 +1126,9 @@ func TestConnectionHandlerOpenUpdateClose(t *testing.T) {
11281126
connPool, err := pool.ConnectWithOpts(ctx, poolInstances, poolOpts)
11291127
require.Nilf(t, err, "failed to connect")
11301128
require.NotNilf(t, connPool, "conn is nil after Connect")
1129+
for _, err := range h.errs {
1130+
t.Errorf("pool.ConnectWithOpts: unexpected error: %s", err)
1131+
}
11311132

11321133
_, err = connPool.Call17("box.cfg", []interface{}{map[string]bool{
11331134
"read_only": true,
@@ -1169,9 +1170,9 @@ func TestConnectionHandlerOpenUpdateClose(t *testing.T) {
11691170

11701171
discovered = atomic.LoadUint32(&h.discovered)
11711172
deactivated = atomic.LoadUint32(&h.deactivated)
1172-
require.Equalf(t, uint32(len(poolServers)+1), discovered,
1173+
require.Equalf(t, uint32(len(roles)+1), discovered,
11731174
"unexpected discovered count")
1174-
require.Equalf(t, uint32(len(poolServers)+1), deactivated,
1175+
require.Equalf(t, uint32(len(roles)+1), deactivated,
11751176
"unexpected deactivated count")
11761177
}
11771178

@@ -1246,10 +1247,10 @@ func (h *testUpdateErrorHandler) Deactivated(name string, conn *tarantool.Connec
12461247

12471248
func TestConnectionHandlerUpdateError(t *testing.T) {
12481249
poolServers := []string{servers[0], servers[1]}
1249-
poolInstances := makeInstances(poolServers, connOpts)
1250+
poolInstances := instances[:2]
12501251
roles := []bool{false, false}
12511252

1252-
err := test_helpers.SetClusterRO(makeDialers(poolServers), connOpts, roles)
1253+
err := test_helpers.SetClusterRO(poolInstances, roles)
12531254
require.Nilf(t, err, "fail to set roles for cluster")
12541255

12551256
h := &testUpdateErrorHandler{}
@@ -1320,11 +1321,11 @@ func (h *testDeactivatedErrorHandler) Deactivated(name string, conn *tarantool.C
13201321
}
13211322

13221323
func TestConnectionHandlerDeactivated_on_remove(t *testing.T) {
1323-
poolServers := []string{servers[0], servers[1]}
1324-
poolInstances := makeInstances(poolServers, connOpts)
1324+
poolServers := servers[:2]
1325+
poolInstances := instances[:2]
13251326
roles := []bool{false, false}
13261327

1327-
err := test_helpers.SetClusterRO(makeDialers(poolServers), connOpts, roles)
1328+
err := test_helpers.SetClusterRO(poolInstances, roles)
13281329
require.Nilf(t, err, "fail to set roles for cluster")
13291330

13301331
h := &testDeactivatedErrorHandler{}
@@ -1413,7 +1414,7 @@ func TestRequestOnClosed(t *testing.T) {
14131414
func TestCall(t *testing.T) {
14141415
roles := []bool{false, true, false, false, true}
14151416

1416-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1417+
err := test_helpers.SetClusterRO(instances, roles)
14171418
require.Nilf(t, err, "fail to set roles for cluster")
14181419

14191420
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1472,7 +1473,7 @@ func TestCall(t *testing.T) {
14721473
func TestCall16(t *testing.T) {
14731474
roles := []bool{false, true, false, false, true}
14741475

1475-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1476+
err := test_helpers.SetClusterRO(instances, roles)
14761477
require.Nilf(t, err, "fail to set roles for cluster")
14771478

14781479
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1531,7 +1532,7 @@ func TestCall16(t *testing.T) {
15311532
func TestCall17(t *testing.T) {
15321533
roles := []bool{false, true, false, false, true}
15331534

1534-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1535+
err := test_helpers.SetClusterRO(instances, roles)
15351536
require.Nilf(t, err, "fail to set roles for cluster")
15361537

15371538
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1590,7 +1591,7 @@ func TestCall17(t *testing.T) {
15901591
func TestEval(t *testing.T) {
15911592
roles := []bool{false, true, false, false, true}
15921593

1593-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1594+
err := test_helpers.SetClusterRO(instances, roles)
15941595
require.Nilf(t, err, "fail to set roles for cluster")
15951596

15961597
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1670,7 +1671,7 @@ func TestExecute(t *testing.T) {
16701671

16711672
roles := []bool{false, true, false, false, true}
16721673

1673-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1674+
err := test_helpers.SetClusterRO(instances, roles)
16741675
require.Nilf(t, err, "fail to set roles for cluster")
16751676

16761677
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1728,7 +1729,7 @@ func TestRoundRobinStrategy(t *testing.T) {
17281729

17291730
serversNumber := len(servers)
17301731

1731-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1732+
err := test_helpers.SetClusterRO(instances, roles)
17321733
require.Nilf(t, err, "fail to set roles for cluster")
17331734

17341735
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1807,7 +1808,7 @@ func TestRoundRobinStrategy_NoReplica(t *testing.T) {
18071808
servers[4]: true,
18081809
}
18091810

1810-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1811+
err := test_helpers.SetClusterRO(instances, roles)
18111812
require.Nilf(t, err, "fail to set roles for cluster")
18121813

18131814
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1880,7 +1881,7 @@ func TestRoundRobinStrategy_NoMaster(t *testing.T) {
18801881
servers[4]: true,
18811882
}
18821883

1883-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1884+
err := test_helpers.SetClusterRO(instances, roles)
18841885
require.Nilf(t, err, "fail to set roles for cluster")
18851886

18861887
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -1965,7 +1966,7 @@ func TestUpdateInstancesRoles(t *testing.T) {
19651966

19661967
serversNumber := len(servers)
19671968

1968-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
1969+
err := test_helpers.SetClusterRO(instances, roles)
19691970
require.Nilf(t, err, "fail to set roles for cluster")
19701971

19711972
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2044,7 +2045,7 @@ func TestUpdateInstancesRoles(t *testing.T) {
20442045
servers[3]: true,
20452046
}
20462047

2047-
err = test_helpers.SetClusterRO(dialers, connOpts, roles)
2048+
err = test_helpers.SetClusterRO(instances, roles)
20482049
require.Nilf(t, err, "fail to set roles for cluster")
20492050

20502051
// ANY
@@ -2111,7 +2112,7 @@ func TestUpdateInstancesRoles(t *testing.T) {
21112112
func TestInsert(t *testing.T) {
21122113
roles := []bool{true, true, false, true, true}
21132114

2114-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2115+
err := test_helpers.SetClusterRO(instances, roles)
21152116
require.Nilf(t, err, "fail to set roles for cluster")
21162117

21172118
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2210,7 +2211,7 @@ func TestInsert(t *testing.T) {
22102211
func TestDelete(t *testing.T) {
22112212
roles := []bool{true, true, false, true, true}
22122213

2213-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2214+
err := test_helpers.SetClusterRO(instances, roles)
22142215
require.Nilf(t, err, "fail to set roles for cluster")
22152216

22162217
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2274,7 +2275,7 @@ func TestDelete(t *testing.T) {
22742275
func TestUpsert(t *testing.T) {
22752276
roles := []bool{true, true, false, true, true}
22762277

2277-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2278+
err := test_helpers.SetClusterRO(instances, roles)
22782279
require.Nilf(t, err, "fail to set roles for cluster")
22792280

22802281
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2346,7 +2347,7 @@ func TestUpsert(t *testing.T) {
23462347
func TestUpdate(t *testing.T) {
23472348
roles := []bool{true, true, false, true, true}
23482349

2349-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2350+
err := test_helpers.SetClusterRO(instances, roles)
23502351
require.Nilf(t, err, "fail to set roles for cluster")
23512352

23522353
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2435,7 +2436,7 @@ func TestUpdate(t *testing.T) {
24352436
func TestReplace(t *testing.T) {
24362437
roles := []bool{true, true, false, true, true}
24372438

2438-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2439+
err := test_helpers.SetClusterRO(instances, roles)
24392440
require.Nilf(t, err, "fail to set roles for cluster")
24402441

24412442
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2520,7 +2521,7 @@ func TestReplace(t *testing.T) {
25202521
func TestSelect(t *testing.T) {
25212522
roles := []bool{true, true, false, true, false}
25222523

2523-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2524+
err := test_helpers.SetClusterRO(instances, roles)
25242525
require.Nilf(t, err, "fail to set roles for cluster")
25252526

25262527
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2642,7 +2643,7 @@ func TestSelect(t *testing.T) {
26422643
func TestPing(t *testing.T) {
26432644
roles := []bool{true, true, false, true, false}
26442645

2645-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2646+
err := test_helpers.SetClusterRO(instances, roles)
26462647
require.Nilf(t, err, "fail to set roles for cluster")
26472648

26482649
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2681,7 +2682,7 @@ func TestPing(t *testing.T) {
26812682
func TestDo(t *testing.T) {
26822683
roles := []bool{true, true, false, true, false}
26832684

2684-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2685+
err := test_helpers.SetClusterRO(instances, roles)
26852686
require.Nilf(t, err, "fail to set roles for cluster")
26862687

26872688
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2717,7 +2718,7 @@ func TestDo(t *testing.T) {
27172718
func TestDo_concurrent(t *testing.T) {
27182719
roles := []bool{true, true, false, true, false}
27192720

2720-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2721+
err := test_helpers.SetClusterRO(instances, roles)
27212722
require.Nilf(t, err, "fail to set roles for cluster")
27222723

27232724
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2766,7 +2767,7 @@ func TestDoInstance(t *testing.T) {
27662767
func TestDoInstance_not_found(t *testing.T) {
27672768
roles := []bool{true, true, false, true, false}
27682769

2769-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2770+
err := test_helpers.SetClusterRO(instances, roles)
27702771
require.Nilf(t, err, "fail to set roles for cluster")
27712772

27722773
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2820,7 +2821,7 @@ func TestNewPrepared(t *testing.T) {
28202821

28212822
roles := []bool{true, true, false, true, false}
28222823

2823-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2824+
err := test_helpers.SetClusterRO(instances, roles)
28242825
require.Nilf(t, err, "fail to set roles for cluster")
28252826

28262827
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2892,7 +2893,7 @@ func TestDoWithStrangerConn(t *testing.T) {
28922893

28932894
roles := []bool{true, true, false, true, false}
28942895

2895-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
2896+
err := test_helpers.SetClusterRO(instances, roles)
28962897
require.Nilf(t, err, "fail to set roles for cluster")
28972898

28982899
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -2922,7 +2923,7 @@ func TestStream_Commit(t *testing.T) {
29222923

29232924
roles := []bool{true, true, false, true, true}
29242925

2925-
err = test_helpers.SetClusterRO(dialers, connOpts, roles)
2926+
err = test_helpers.SetClusterRO(instances, roles)
29262927
require.Nilf(t, err, "fail to set roles for cluster")
29272928

29282929
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -3013,7 +3014,7 @@ func TestStream_Rollback(t *testing.T) {
30133014

30143015
roles := []bool{true, true, false, true, true}
30153016

3016-
err = test_helpers.SetClusterRO(dialers, connOpts, roles)
3017+
err = test_helpers.SetClusterRO(instances, roles)
30173018
require.Nilf(t, err, "fail to set roles for cluster")
30183019

30193020
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -3103,7 +3104,7 @@ func TestStream_TxnIsolationLevel(t *testing.T) {
31033104

31043105
roles := []bool{true, true, false, true, true}
31053106

3106-
err = test_helpers.SetClusterRO(dialers, connOpts, roles)
3107+
err = test_helpers.SetClusterRO(instances, roles)
31073108
require.Nilf(t, err, "fail to set roles for cluster")
31083109

31093110
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -3214,7 +3215,7 @@ func TestConnectionPool_NewWatcher_modes(t *testing.T) {
32143215

32153216
roles := []bool{true, false, false, true, true}
32163217

3217-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
3218+
err := test_helpers.SetClusterRO(instances, roles)
32183219
require.Nilf(t, err, "fail to set roles for cluster")
32193220

32203221
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -3291,7 +3292,7 @@ func TestConnectionPool_NewWatcher_update(t *testing.T) {
32913292
const initCnt = 2
32923293
roles := []bool{true, false, false, true, true}
32933294

3294-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
3295+
err := test_helpers.SetClusterRO(instances, roles)
32953296
require.Nilf(t, err, "fail to set roles for cluster")
32963297

32973298
poolOpts := pool.Opts{
@@ -3338,7 +3339,7 @@ func TestConnectionPool_NewWatcher_update(t *testing.T) {
33383339
for i, role := range roles {
33393340
roles[i] = !role
33403341
}
3341-
err = test_helpers.SetClusterRO(dialers, connOpts, roles)
3342+
err = test_helpers.SetClusterRO(instances, roles)
33423343
require.Nilf(t, err, "fail to set roles for cluster")
33433344

33443345
// Wait for all updated events.
@@ -3376,7 +3377,7 @@ func TestWatcher_Unregister(t *testing.T) {
33763377
const expectedCnt = 2
33773378
roles := []bool{true, false, false, true, true}
33783379

3379-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
3380+
err := test_helpers.SetClusterRO(instances, roles)
33803381
require.Nilf(t, err, "fail to set roles for cluster")
33813382

33823383
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -3433,7 +3434,7 @@ func TestConnectionPool_NewWatcher_concurrent(t *testing.T) {
34333434

34343435
roles := []bool{true, false, false, true, true}
34353436

3436-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
3437+
err := test_helpers.SetClusterRO(instances, roles)
34373438
require.Nilf(t, err, "fail to set roles for cluster")
34383439

34393440
ctx, cancel := test_helpers.GetPoolConnectContext()
@@ -3471,7 +3472,7 @@ func TestWatcher_Unregister_concurrent(t *testing.T) {
34713472

34723473
roles := []bool{true, false, false, true, true}
34733474

3474-
err := test_helpers.SetClusterRO(dialers, connOpts, roles)
3475+
err := test_helpers.SetClusterRO(instances, roles)
34753476
require.Nilf(t, err, "fail to set roles for cluster")
34763477

34773478
ctx, cancel := test_helpers.GetPoolConnectContext()

0 commit comments

Comments
 (0)