mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-2794 Fix up dots and dollars spec tests

Browse Source
This commit is contained in:
Bernie Hackett 2021-07-06 13:43:14 -07:00
parent a142125640
commit 907bb7e3dc
5 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/crud/unified/insertMany-dots_and_dollars.json
View File

@ -53,10 +53,11 @@
]
},
"expectResult": {
"insertedCount": 1,
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
"$$unsetOrMatches": {
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
}
}
}
}
@ -162,10 +163,11 @@
]
},
"expectResult": {
"insertedCount": 1,
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
"$$unsetOrMatches": {
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
}
}
}
}
@ -221,10 +223,11 @@
]
},
"expectResult": {
"insertedCount": 1,
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
"$$unsetOrMatches": {
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
}
}
}
}
@ -284,10 +287,11 @@
]
},
"expectResult": {
"insertedCount": 1,
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
"$$unsetOrMatches": {
"insertedIds": {
"$$unsetOrMatches": {
"0": 1
}
}
}
}

50
test/crud/unified/insertOne-dots_and_dollars.json
View File

@ -63,9 +63,10 @@
}
},
"expectResult": {
"insertedCount": 1,
"insertedId": {
"$$unsetOrMatches": 1
"$$unsetOrMatches": {
"insertedId": {
"$$unsetOrMatches": 1
}
}
}
}
@ -166,9 +167,10 @@
}
},
"expectResult": {
"insertedCount": 1,
"insertedId": {
"$$unsetOrMatches": 1
"$$unsetOrMatches": {
"insertedId": {
"$$unsetOrMatches": 1
}
}
}
}
@ -221,9 +223,10 @@
}
},
"expectResult": {
"insertedCount": 1,
"insertedId": {
"$$unsetOrMatches": 1
"$$unsetOrMatches": {
"insertedId": {
"$$unsetOrMatches": 1
}
}
}
}
@ -280,9 +283,10 @@
}
},
"expectResult": {
"insertedCount": 1,
"insertedId": {
"$$unsetOrMatches": 1
"$$unsetOrMatches": {
"insertedId": {
"$$unsetOrMatches": 1
}
}
}
}
@ -390,10 +394,11 @@
}
},
"expectResult": {
"insertedCount": 1,
"insertedId": {
"$$unsetOrMatches": {
"a.b": 1
"$$unsetOrMatches": {
"insertedId": {
"$$unsetOrMatches": {
"a.b": 1
}
}
}
}
@ -501,9 +506,10 @@
}
},
"expectResult": {
"insertedCount": 1,
"insertedId": {
"$$unsetOrMatches": 1
"$$unsetOrMatches": {
"insertedId": {
"$$unsetOrMatches": 1
}
}
}
}
@ -564,8 +570,10 @@
}
},
"expectResult": {
"acknowledged": {
"$$unsetOrMatches": false
"$$unsetOrMatches": {
"acknowledged": {
"$$unsetOrMatches": false
}
}
}
}

19
test/unified-test-format/valid-pass/poc-crud.json
View File

@ -1,6 +1,6 @@
{
"description": "poc-crud",
"schemaVersion": "1.0",
"schemaVersion": "1.4",
"createEntities": [
{
"client": {
@ -242,12 +242,14 @@
},
"expectError": {
"expectResult": {
"deletedCount": 0,
"insertedCount": 2,
"matchedCount": 0,
"modifiedCount": 0,
"upsertedCount": 0,
"upsertedIds": {}
"$$unsetOrMatches": {
"deletedCount": 0,
"insertedCount": 2,
"matchedCount": 0,
"modifiedCount": 0,
"upsertedCount": 0,
"upsertedIds": {}
}
}
}
}
@ -406,7 +408,8 @@
"description": "Aggregate with $listLocalSessions",
"runOnRequirements": [
{
"minServerVersion": "3.6.0"
"minServerVersion": "3.6.0",
"serverless": "forbid"
}
],
"operations": [

3
test/unified-test-format/valid-pass/poc-retryable-writes.json
View File

@ -298,9 +298,6 @@
},
"expectResult": {
"$$unsetOrMatches": {
"insertedCount": {
"$$unsetOrMatches": 2
},
"insertedIds": {
"$$unsetOrMatches": {
"0": 3,

6
test/unified_format.py
View File

@ -612,11 +612,9 @@ def coerce_result(opname, result):
if opname == 'bulkWrite':
return parse_bulk_write_result(result)
if opname == 'insertOne':
return {'insertedId': result.inserted_id, 'insertedCount': 1}
return {'insertedId': result.inserted_id}
if opname == 'insertMany':
res = {idx: _id for idx, _id in enumerate(result.inserted_ids)}
res['insertedCount'] = len(result.inserted_ids)
return res
return {idx: _id for idx, _id in enumerate(result.inserted_ids)}
if opname in ('deleteOne', 'deleteMany'):
return {'deletedCount': result.deleted_count}
if opname in ('updateOne', 'updateMany', 'replaceOne'):