Skip to content

Commit 3ab7390

Browse files
ShaneHarveyShaneHarvey
authored
PYTHON-3500 Resync retryable tests to fix serverless failures (#1116)
1 parent 363e0b2 commit 3ab7390

File tree

2 files changed

+91
-51
lines changed

2 files changed

+91
-51
lines changed

‎test/retryable_reads/unified/handshakeError.json‎

Lines changed: 73 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "retryable reads handshake failures",
3-
"schemaVersion": "1.3",
3+
"schemaVersion": "1.4",
44
"runOnRequirements": [
55
{
66
"minServerVersion": "4.2",
@@ -62,7 +62,7 @@
6262
],
6363
"tests": [
6464
{
65-
"description": "listDatabases succeeds after retryable handshake network error",
65+
"description": "client.listDatabases succeeds after retryable handshake network error",
6666
"operations": [
6767
{
6868
"name": "failPoint",
@@ -155,7 +155,7 @@
155155
]
156156
},
157157
{
158-
"description": "listDatabases succeeds after retryable handshake server error (ShutdownInProgress)",
158+
"description": "client.listDatabases succeeds after retryable handshake server error (ShutdownInProgress)",
159159
"operations": [
160160
{
161161
"name": "failPoint",
@@ -248,7 +248,7 @@
248248
]
249249
},
250250
{
251-
"description": "listDatabaseNames succeeds after retryable handshake network error",
251+
"description": "client.listDatabaseNames succeeds after retryable handshake network error",
252252
"operations": [
253253
{
254254
"name": "failPoint",
@@ -338,7 +338,7 @@
338338
]
339339
},
340340
{
341-
"description": "listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)",
341+
"description": "client.listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)",
342342
"operations": [
343343
{
344344
"name": "failPoint",
@@ -428,7 +428,12 @@
428428
]
429429
},
430430
{
431-
"description": "createChangeStream succeeds after retryable handshake network error",
431+
"description": "client.createChangeStream succeeds after retryable handshake network error",
432+
"runOnRequirements": [
433+
{
434+
"serverless": "forbid"
435+
}
436+
],
432437
"operations": [
433438
{
434439
"name": "failPoint",
@@ -522,7 +527,12 @@
522527
]
523528
},
524529
{
525-
"description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
530+
"description": "client.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
531+
"runOnRequirements": [
532+
{
533+
"serverless": "forbid"
534+
}
535+
],
526536
"operations": [
527537
{
528538
"name": "failPoint",
@@ -616,7 +626,12 @@
616626
]
617627
},
618628
{
619-
"description": "aggregate succeeds after retryable handshake network error",
629+
"description": "database.aggregate succeeds after retryable handshake network error",
630+
"runOnRequirements": [
631+
{
632+
"serverless": "forbid"
633+
}
634+
],
620635
"operations": [
621636
{
622637
"name": "failPoint",
@@ -716,7 +731,12 @@
716731
]
717732
},
718733
{
719-
"description": "aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
734+
"description": "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
735+
"runOnRequirements": [
736+
{
737+
"serverless": "forbid"
738+
}
739+
],
720740
"operations": [
721741
{
722742
"name": "failPoint",
@@ -816,7 +836,7 @@
816836
]
817837
},
818838
{
819-
"description": "listCollections succeeds after retryable handshake network error",
839+
"description": "database.listCollections succeeds after retryable handshake network error",
820840
"operations": [
821841
{
822842
"name": "failPoint",
@@ -909,7 +929,7 @@
909929
]
910930
},
911931
{
912-
"description": "listCollections succeeds after retryable handshake server error (ShutdownInProgress)",
932+
"description": "database.listCollections succeeds after retryable handshake server error (ShutdownInProgress)",
913933
"operations": [
914934
{
915935
"name": "failPoint",
@@ -1002,7 +1022,7 @@
10021022
]
10031023
},
10041024
{
1005-
"description": "listCollectionNames succeeds after retryable handshake network error",
1025+
"description": "database.listCollectionNames succeeds after retryable handshake network error",
10061026
"operations": [
10071027
{
10081028
"name": "failPoint",
@@ -1095,7 +1115,7 @@
10951115
]
10961116
},
10971117
{
1098-
"description": "listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)",
1118+
"description": "database.listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)",
10991119
"operations": [
11001120
{
11011121
"name": "failPoint",
@@ -1188,7 +1208,12 @@
11881208
]
11891209
},
11901210
{
1191-
"description": "createChangeStream succeeds after retryable handshake network error",
1211+
"description": "database.createChangeStream succeeds after retryable handshake network error",
1212+
"runOnRequirements": [
1213+
{
1214+
"serverless": "forbid"
1215+
}
1216+
],
11921217
"operations": [
11931218
{
11941219
"name": "failPoint",
@@ -1282,7 +1307,12 @@
12821307
]
12831308
},
12841309
{
1285-
"description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
1310+
"description": "database.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
1311+
"runOnRequirements": [
1312+
{
1313+
"serverless": "forbid"
1314+
}
1315+
],
12861316
"operations": [
12871317
{
12881318
"name": "failPoint",
@@ -1376,7 +1406,7 @@
13761406
]
13771407
},
13781408
{
1379-
"description": "aggregate succeeds after retryable handshake network error",
1409+
"description": "collection.aggregate succeeds after retryable handshake network error",
13801410
"operations": [
13811411
{
13821412
"name": "failPoint",
@@ -1469,7 +1499,7 @@
14691499
]
14701500
},
14711501
{
1472-
"description": "aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
1502+
"description": "collection.aggregate succeeds after retryable handshake server error (ShutdownInProgress)",
14731503
"operations": [
14741504
{
14751505
"name": "failPoint",
@@ -1562,7 +1592,7 @@
15621592
]
15631593
},
15641594
{
1565-
"description": "countDocuments succeeds after retryable handshake network error",
1595+
"description": "collection.countDocuments succeeds after retryable handshake network error",
15661596
"operations": [
15671597
{
15681598
"name": "failPoint",
@@ -1655,7 +1685,7 @@
16551685
]
16561686
},
16571687
{
1658-
"description": "countDocuments succeeds after retryable handshake server error (ShutdownInProgress)",
1688+
"description": "collection.countDocuments succeeds after retryable handshake server error (ShutdownInProgress)",
16591689
"operations": [
16601690
{
16611691
"name": "failPoint",
@@ -1748,7 +1778,7 @@
17481778
]
17491779
},
17501780
{
1751-
"description": "estimatedDocumentCount succeeds after retryable handshake network error",
1781+
"description": "collection.estimatedDocumentCount succeeds after retryable handshake network error",
17521782
"operations": [
17531783
{
17541784
"name": "failPoint",
@@ -1838,7 +1868,7 @@
18381868
]
18391869
},
18401870
{
1841-
"description": "estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)",
1871+
"description": "collection.estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)",
18421872
"operations": [
18431873
{
18441874
"name": "failPoint",
@@ -1928,7 +1958,7 @@
19281958
]
19291959
},
19301960
{
1931-
"description": "distinct succeeds after retryable handshake network error",
1961+
"description": "collection.distinct succeeds after retryable handshake network error",
19321962
"operations": [
19331963
{
19341964
"name": "failPoint",
@@ -2022,7 +2052,7 @@
20222052
]
20232053
},
20242054
{
2025-
"description": "distinct succeeds after retryable handshake server error (ShutdownInProgress)",
2055+
"description": "collection.distinct succeeds after retryable handshake server error (ShutdownInProgress)",
20262056
"operations": [
20272057
{
20282058
"name": "failPoint",
@@ -2116,7 +2146,7 @@
21162146
]
21172147
},
21182148
{
2119-
"description": "find succeeds after retryable handshake network error",
2149+
"description": "collection.find succeeds after retryable handshake network error",
21202150
"operations": [
21212151
{
21222152
"name": "failPoint",
@@ -2209,7 +2239,7 @@
22092239
]
22102240
},
22112241
{
2212-
"description": "find succeeds after retryable handshake server error (ShutdownInProgress)",
2242+
"description": "collection.find succeeds after retryable handshake server error (ShutdownInProgress)",
22132243
"operations": [
22142244
{
22152245
"name": "failPoint",
@@ -2302,7 +2332,7 @@
23022332
]
23032333
},
23042334
{
2305-
"description": "findOne succeeds after retryable handshake network error",
2335+
"description": "collection.findOne succeeds after retryable handshake network error",
23062336
"operations": [
23072337
{
23082338
"name": "failPoint",
@@ -2395,7 +2425,7 @@
23952425
]
23962426
},
23972427
{
2398-
"description": "findOne succeeds after retryable handshake server error (ShutdownInProgress)",
2428+
"description": "collection.findOne succeeds after retryable handshake server error (ShutdownInProgress)",
23992429
"operations": [
24002430
{
24012431
"name": "failPoint",
@@ -2488,7 +2518,7 @@
24882518
]
24892519
},
24902520
{
2491-
"description": "listIndexes succeeds after retryable handshake network error",
2521+
"description": "collection.listIndexes succeeds after retryable handshake network error",
24922522
"operations": [
24932523
{
24942524
"name": "failPoint",
@@ -2578,7 +2608,7 @@
25782608
]
25792609
},
25802610
{
2581-
"description": "listIndexes succeeds after retryable handshake server error (ShutdownInProgress)",
2611+
"description": "collection.listIndexes succeeds after retryable handshake server error (ShutdownInProgress)",
25822612
"operations": [
25832613
{
25842614
"name": "failPoint",
@@ -2668,7 +2698,7 @@
26682698
]
26692699
},
26702700
{
2671-
"description": "listIndexNames succeeds after retryable handshake network error",
2701+
"description": "collection.listIndexNames succeeds after retryable handshake network error",
26722702
"operations": [
26732703
{
26742704
"name": "failPoint",
@@ -2758,7 +2788,7 @@
27582788
]
27592789
},
27602790
{
2761-
"description": "listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)",
2791+
"description": "collection.listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)",
27622792
"operations": [
27632793
{
27642794
"name": "failPoint",
@@ -2848,7 +2878,12 @@
28482878
]
28492879
},
28502880
{
2851-
"description": "createChangeStream succeeds after retryable handshake network error",
2881+
"description": "collection.createChangeStream succeeds after retryable handshake network error",
2882+
"runOnRequirements": [
2883+
{
2884+
"serverless": "forbid"
2885+
}
2886+
],
28522887
"operations": [
28532888
{
28542889
"name": "failPoint",
@@ -2942,7 +2977,12 @@
29422977
]
29432978
},
29442979
{
2945-
"description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
2980+
"description": "collection.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)",
2981+
"runOnRequirements": [
2982+
{
2983+
"serverless": "forbid"
2984+
}
2985+
],
29462986
"operations": [
29472987
{
29482988
"name": "failPoint",

0 commit comments

Comments
 (0)