Skip to content

Commit cd823c8

Browse files
authored
PYTHON-2600 Resync spec tests for versioned api (#599)
Also resolves PYTHON-2599 and PYTHON-2641.
1 parent fac0372 commit cd823c8

File tree

5 files changed

+141
-10
lines changed

5 files changed

+141
-10
lines changed

.evergreen/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,11 +1944,11 @@ axes:
19441944
REQUIRE_API_VERSION: "1"
19451945
# MONGODB_API_VERSION is the apiVersion to use in the test suite.
19461946
MONGODB_API_VERSION: "1"
1947-
# Test against a cluster with acceptAPIVersion2 but without
1947+
# Test against a cluster with acceptApiVersion2 but without
19481948
# requireApiVersion, and don't automatically add apiVersion to
19491949
# clients created in the test suite.
1950-
- id: "acceptAPIVersion2"
1951-
display_name: "acceptAPIVersion2"
1950+
- id: "acceptApiVersion2"
1951+
display_name: "acceptApiVersion2"
19521952
tags: [ "versionedApi_tag" ]
19531953
variables:
19541954
ORCHESTRATION_FILE: "versioned-api-testing.json"
@@ -2434,7 +2434,7 @@ buildvariants:
24342434

24352435
- matrix_name: "versioned-api-tests"
24362436
matrix_spec:
2437-
platform: ubuntu-16.04
2437+
platform: ubuntu-18.04
24382438
python-version: ["3.6", "3.9"]
24392439
auth: "auth"
24402440
versionedApi: "*"

test/versioned-api/runcommand-helper-no-api-version-declared.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"serverParameters": {
88
"requireApiVersion": false
99
}

test/versioned-api/test-commands-deprecation-errors.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"serverParameters": {
88
"enableTestCommands": true,
9-
"acceptAPIVersion2": true,
9+
"acceptApiVersion2": true,
1010
"requireApiVersion": false
1111
}
1212
}

test/versioned-api/test-commands-strict-mode.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"serverParameters": {
88
"enableTestCommands": true
99
}

test/versioned-api/transaction-handling.json

Lines changed: 133 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"topologies": [
88
"replicaset",
99
"sharded-replicaset"
@@ -382,7 +382,138 @@
382382
]
383383
}
384384
]
385+
},
386+
{
387+
"description": "abortTransaction does not include an API version",
388+
"runOnRequirements": [
389+
{
390+
"topologies": [
391+
"replicaset",
392+
"sharded-replicaset"
393+
]
394+
}
395+
],
396+
"operations": [
397+
{
398+
"name": "startTransaction",
399+
"object": "session"
400+
},
401+
{
402+
"name": "insertOne",
403+
"object": "collection",
404+
"arguments": {
405+
"session": "session",
406+
"document": {
407+
"_id": 6,
408+
"x": 66
409+
}
410+
},
411+
"expectResult": {
412+
"$$unsetOrMatches": {
413+
"insertedId": {
414+
"$$unsetOrMatches": 6
415+
}
416+
}
417+
}
418+
},
419+
{
420+
"name": "insertOne",
421+
"object": "collection",
422+
"arguments": {
423+
"session": "session",
424+
"document": {
425+
"_id": 7,
426+
"x": 77
427+
}
428+
},
429+
"expectResult": {
430+
"$$unsetOrMatches": {
431+
"insertedId": {
432+
"$$unsetOrMatches": 7
433+
}
434+
}
435+
}
436+
},
437+
{
438+
"name": "abortTransaction",
439+
"object": "session"
440+
}
441+
],
442+
"expectEvents": [
443+
{
444+
"client": "client",
445+
"events": [
446+
{
447+
"commandStartedEvent": {
448+
"command": {
449+
"insert": "test",
450+
"documents": [
451+
{
452+
"_id": 6,
453+
"x": 66
454+
}
455+
],
456+
"lsid": {
457+
"$$sessionLsid": "session"
458+
},
459+
"startTransaction": true,
460+
"apiVersion": "1",
461+
"apiStrict": {
462+
"$$unsetOrMatches": false
463+
},
464+
"apiDeprecationErrors": {
465+
"$$unsetOrMatches": false
466+
}
467+
}
468+
}
469+
},
470+
{
471+
"commandStartedEvent": {
472+
"command": {
473+
"insert": "test",
474+
"documents": [
475+
{
476+
"_id": 7,
477+
"x": 77
478+
}
479+
],
480+
"lsid": {
481+
"$$sessionLsid": "session"
482+
},
483+
"apiVersion": {
484+
"$$exists": false
485+
},
486+
"apiStrict": {
487+
"$$exists": false
488+
},
489+
"apiDeprecationErrors": {
490+
"$$exists": false
491+
}
492+
}
493+
}
494+
},
495+
{
496+
"commandStartedEvent": {
497+
"command": {
498+
"abortTransaction": 1,
499+
"lsid": {
500+
"$$sessionLsid": "session"
501+
},
502+
"apiVersion": {
503+
"$$exists": false
504+
},
505+
"apiStrict": {
506+
"$$exists": false
507+
},
508+
"apiDeprecationErrors": {
509+
"$$exists": false
510+
}
511+
}
512+
}
513+
}
514+
]
515+
}
516+
]
385517
}
386518
]
387519
}
388-

0 commit comments

Comments
 (0)