Skip to content

Commit 1a60c03

Browse files
behackettbehackett
committed
PYTHON-2794 Fix up dots and dollars spec tests
(cherry picked from commit 907bb7e)
1 parent 44a4fab commit 1a60c03

File tree

5 files changed

+62
-52
lines changed

5 files changed

+62
-52
lines changed

‎test/crud/unified/insertMany-dots_and_dollars.json‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@
5353
]
5454
},
5555
"expectResult": {
56-
"insertedCount": 1,
57-
"insertedIds": {
58-
"$$unsetOrMatches": {
59-
"0": 1
56+
"$$unsetOrMatches": {
57+
"insertedIds": {
58+
"$$unsetOrMatches": {
59+
"0": 1
60+
}
6061
}
6162
}
6263
}
@@ -162,10 +163,11 @@
162163
]
163164
},
164165
"expectResult": {
165-
"insertedCount": 1,
166-
"insertedIds": {
167-
"$$unsetOrMatches": {
168-
"0": 1
166+
"$$unsetOrMatches": {
167+
"insertedIds": {
168+
"$$unsetOrMatches": {
169+
"0": 1
170+
}
169171
}
170172
}
171173
}
@@ -221,10 +223,11 @@
221223
]
222224
},
223225
"expectResult": {
224-
"insertedCount": 1,
225-
"insertedIds": {
226-
"$$unsetOrMatches": {
227-
"0": 1
226+
"$$unsetOrMatches": {
227+
"insertedIds": {
228+
"$$unsetOrMatches": {
229+
"0": 1
230+
}
228231
}
229232
}
230233
}
@@ -284,10 +287,11 @@
284287
]
285288
},
286289
"expectResult": {
287-
"insertedCount": 1,
288-
"insertedIds": {
289-
"$$unsetOrMatches": {
290-
"0": 1
290+
"$$unsetOrMatches": {
291+
"insertedIds": {
292+
"$$unsetOrMatches": {
293+
"0": 1
294+
}
291295
}
292296
}
293297
}

‎test/crud/unified/insertOne-dots_and_dollars.json‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@
6363
}
6464
},
6565
"expectResult": {
66-
"insertedCount": 1,
67-
"insertedId": {
68-
"$$unsetOrMatches": 1
66+
"$$unsetOrMatches": {
67+
"insertedId": {
68+
"$$unsetOrMatches": 1
69+
}
6970
}
7071
}
7172
}
@@ -166,9 +167,10 @@
166167
}
167168
},
168169
"expectResult": {
169-
"insertedCount": 1,
170-
"insertedId": {
171-
"$$unsetOrMatches": 1
170+
"$$unsetOrMatches": {
171+
"insertedId": {
172+
"$$unsetOrMatches": 1
173+
}
172174
}
173175
}
174176
}
@@ -221,9 +223,10 @@
221223
}
222224
},
223225
"expectResult": {
224-
"insertedCount": 1,
225-
"insertedId": {
226-
"$$unsetOrMatches": 1
226+
"$$unsetOrMatches": {
227+
"insertedId": {
228+
"$$unsetOrMatches": 1
229+
}
227230
}
228231
}
229232
}
@@ -280,9 +283,10 @@
280283
}
281284
},
282285
"expectResult": {
283-
"insertedCount": 1,
284-
"insertedId": {
285-
"$$unsetOrMatches": 1
286+
"$$unsetOrMatches": {
287+
"insertedId": {
288+
"$$unsetOrMatches": 1
289+
}
286290
}
287291
}
288292
}
@@ -390,10 +394,11 @@
390394
}
391395
},
392396
"expectResult": {
393-
"insertedCount": 1,
394-
"insertedId": {
395-
"$$unsetOrMatches": {
396-
"a.b": 1
397+
"$$unsetOrMatches": {
398+
"insertedId": {
399+
"$$unsetOrMatches": {
400+
"a.b": 1
401+
}
397402
}
398403
}
399404
}
@@ -501,9 +506,10 @@
501506
}
502507
},
503508
"expectResult": {
504-
"insertedCount": 1,
505-
"insertedId": {
506-
"$$unsetOrMatches": 1
509+
"$$unsetOrMatches": {
510+
"insertedId": {
511+
"$$unsetOrMatches": 1
512+
}
507513
}
508514
}
509515
}
@@ -564,8 +570,10 @@
564570
}
565571
},
566572
"expectResult": {
567-
"acknowledged": {
568-
"$$unsetOrMatches": false
573+
"$$unsetOrMatches": {
574+
"acknowledged": {
575+
"$$unsetOrMatches": false
576+
}
569577
}
570578
}
571579
}

‎test/unified-test-format/valid-pass/poc-crud.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "poc-crud",
3-
"schemaVersion": "1.0",
3+
"schemaVersion": "1.4",
44
"createEntities": [
55
{
66
"client": {
@@ -242,12 +242,14 @@
242242
},
243243
"expectError": {
244244
"expectResult": {
245-
"deletedCount": 0,
246-
"insertedCount": 2,
247-
"matchedCount": 0,
248-
"modifiedCount": 0,
249-
"upsertedCount": 0,
250-
"upsertedIds": {}
245+
"$$unsetOrMatches": {
246+
"deletedCount": 0,
247+
"insertedCount": 2,
248+
"matchedCount": 0,
249+
"modifiedCount": 0,
250+
"upsertedCount": 0,
251+
"upsertedIds": {}
252+
}
251253
}
252254
}
253255
}
@@ -406,7 +408,8 @@
406408
"description": "Aggregate with $listLocalSessions",
407409
"runOnRequirements": [
408410
{
409-
"minServerVersion": "3.6.0"
411+
"minServerVersion": "3.6.0",
412+
"serverless": "forbid"
410413
}
411414
],
412415
"operations": [

‎test/unified-test-format/valid-pass/poc-retryable-writes.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,6 @@
298298
},
299299
"expectResult": {
300300
"$$unsetOrMatches": {
301-
"insertedCount": {
302-
"$$unsetOrMatches": 2
303-
},
304301
"insertedIds": {
305302
"$$unsetOrMatches": {
306303
"0": 3,

‎test/unified_format.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,11 +622,9 @@ def coerce_result(opname, result):
622622
if opname == 'bulkWrite':
623623
return parse_bulk_write_result(result)
624624
if opname == 'insertOne':
625-
return {'insertedId': result.inserted_id, 'insertedCount': 1}
625+
return {'insertedId': result.inserted_id}
626626
if opname == 'insertMany':
627-
res = {idx: _id for idx, _id in enumerate(result.inserted_ids)}
628-
res['insertedCount'] = len(result.inserted_ids)
629-
return res
627+
return {idx: _id for idx, _id in enumerate(result.inserted_ids)}
630628
if opname in ('deleteOne', 'deleteMany'):
631629
return {'deletedCount': result.deleted_count}
632630
if opname in ('updateOne', 'updateMany', 'replaceOne'):

0 commit comments

Comments
 (0)