PYTHON-5569: [Build Failure] Spec Resync job is failing silently (#2553)
This commit is contained in:
parent
e0767cf5a1
commit
4839e523c8
@ -41,7 +41,7 @@ rm $PYMONGO/test/index_management/index-rawdata.json
|
|||||||
rm $PYMONGO/test/collection_management/modifyCollection-*.json
|
rm $PYMONGO/test/collection_management/modifyCollection-*.json
|
||||||
|
|
||||||
# PYTHON-5248 - Remove support for MongoDB 4.0
|
# PYTHON-5248 - Remove support for MongoDB 4.0
|
||||||
rm $PYMONGO/test/**/pre-42-*.json
|
find /$PYMONGO /test -type f -name 'pre-42-*.json' -delete
|
||||||
|
|
||||||
# PYTHON-3359 - Remove Database and Collection level timeout override
|
# PYTHON-3359 - Remove Database and Collection level timeout override
|
||||||
rm $PYMONGO/test/csot/override-collection-timeoutMS.json
|
rm $PYMONGO/test/csot/override-collection-timeoutMS.json
|
||||||
|
|||||||
@ -30,14 +30,18 @@ def resync_specs(directory: pathlib.Path, errored: dict[str, str]) -> None:
|
|||||||
print("Done syncing specs")
|
print("Done syncing specs")
|
||||||
|
|
||||||
|
|
||||||
def apply_patches():
|
def apply_patches(errored):
|
||||||
print("Beginning to apply patches")
|
print("Beginning to apply patches")
|
||||||
subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True) # noqa: S603, S607
|
subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True) # noqa: S603, S607
|
||||||
subprocess.run(
|
try:
|
||||||
["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"], # noqa: S607
|
subprocess.run(
|
||||||
shell=True, # noqa: S602
|
["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"], # noqa: S607
|
||||||
check=True,
|
shell=True, # noqa: S602
|
||||||
)
|
check=True,
|
||||||
|
stderr=subprocess.PIPE,
|
||||||
|
)
|
||||||
|
except CalledProcessError as exc:
|
||||||
|
errored["applying patches"] = exc.stderr
|
||||||
|
|
||||||
|
|
||||||
def check_new_spec_directories(directory: pathlib.Path) -> list[str]:
|
def check_new_spec_directories(directory: pathlib.Path) -> list[str]:
|
||||||
@ -85,7 +89,7 @@ def write_summary(errored: dict[str, str], new: list[str], filename: Optional[st
|
|||||||
pr_body += "\n -".join(succeeded)
|
pr_body += "\n -".join(succeeded)
|
||||||
pr_body += "\n"
|
pr_body += "\n"
|
||||||
if len(errored) > 0:
|
if len(errored) > 0:
|
||||||
pr_body += "\n\nThe following spec syncs encountered errors:\n -"
|
pr_body += "\n\nThe following spec syncs encountered errors:"
|
||||||
for k, v in errored.items():
|
for k, v in errored.items():
|
||||||
pr_body += f"\n -{k}\n```{v}\n```"
|
pr_body += f"\n -{k}\n```{v}\n```"
|
||||||
pr_body += "\n"
|
pr_body += "\n"
|
||||||
@ -106,7 +110,7 @@ def main(args: Namespace):
|
|||||||
directory = pathlib.Path("./test")
|
directory = pathlib.Path("./test")
|
||||||
errored: dict[str, str] = {}
|
errored: dict[str, str] = {}
|
||||||
resync_specs(directory, errored)
|
resync_specs(directory, errored)
|
||||||
apply_patches()
|
apply_patches(errored)
|
||||||
new = check_new_spec_directories(directory)
|
new = check_new_spec_directories(directory)
|
||||||
write_summary(errored, new, args.filename)
|
write_summary(errored, new, args.filename)
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Run spec syncing script and create PR
|
# Run spec syncing script and create PR
|
||||||
|
set -eu
|
||||||
|
|
||||||
# SETUP
|
# SETUP
|
||||||
SRC_URL="https://github.com/mongodb/specifications.git"
|
SRC_URL="https://github.com/mongodb/specifications.git"
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
|
diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
|
||||||
index 4b492f7d8..e44fad1bc 100644
|
index e44fad1b..4b492f7d 100644
|
||||||
--- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
|
--- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
|
||||||
+++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
|
+++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
|
||||||
@@ -5,8 +5,7 @@
|
@@ -5,7 +5,8 @@
|
||||||
{
|
{
|
||||||
"topologies": [
|
"topologies": [
|
||||||
"single",
|
"single",
|
||||||
+ "sharded"
|
- "sharded"
|
||||||
- "sharded",
|
+ "sharded",
|
||||||
- "sharded-replicaset"
|
+ "sharded-replicaset"
|
||||||
],
|
],
|
||||||
"serverless": "forbid"
|
"serverless": "forbid"
|
||||||
}
|
}
|
||||||
|
|||||||
440
.evergreen/spec-patch/PYTHON-5052.patch
Normal file
440
.evergreen/spec-patch/PYTHON-5052.patch
Normal file
@ -0,0 +1,440 @@
|
|||||||
|
diff --git a/test/unified-test-format/invalid/entity-client-observeTracingMessages-additionalProperties.json b/test/unified-test-format/invalid/entity-client-observeTracingMessages-additionalProperties.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..aa8046d2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/entity-client-observeTracingMessages-additionalProperties.json
|
||||||
|
@@ -0,0 +1,20 @@
|
||||||
|
+{
|
||||||
|
+ "description": "entity-client-observeTracingMessages-additionalProperties",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0",
|
||||||
|
+ "observeTracingMessages": {
|
||||||
|
+ "foo": "bar"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "observeTracingMessages must not have additional properties'",
|
||||||
|
+ "operations": []
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/entity-client-observeTracingMessages-additionalPropertyType.json b/test/unified-test-format/invalid/entity-client-observeTracingMessages-additionalPropertyType.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..0b3a65f5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/entity-client-observeTracingMessages-additionalPropertyType.json
|
||||||
|
@@ -0,0 +1,20 @@
|
||||||
|
+{
|
||||||
|
+ "description": "entity-client-observeTracingMessages-additionalPropertyType",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0",
|
||||||
|
+ "observeTracingMessages": {
|
||||||
|
+ "enableCommandPayload": 0
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "observeTracingMessages enableCommandPayload must be boolean",
|
||||||
|
+ "operations": []
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/entity-client-observeTracingMessages-type.json b/test/unified-test-format/invalid/entity-client-observeTracingMessages-type.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..de3ef39a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/entity-client-observeTracingMessages-type.json
|
||||||
|
@@ -0,0 +1,18 @@
|
||||||
|
+{
|
||||||
|
+ "description": "entity-client-observeTracingMessages-type",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0",
|
||||||
|
+ "observeTracingMessages": "foo"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "observeTracingMessages must be an object",
|
||||||
|
+ "operations": []
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-additionalProperties.json b/test/unified-test-format/invalid/expectedTracingSpans-additionalProperties.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..5947a286
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-additionalProperties.json
|
||||||
|
@@ -0,0 +1,30 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-additionalProperties",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "additional property foo not allowed in expectTracingMessages",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "ignoreExtraSpans": false,
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "command",
|
||||||
|
+ "tags": {
|
||||||
|
+ "db.system": "mongodb"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "foo": 0
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-clientType.json b/test/unified-test-format/invalid/expectedTracingSpans-clientType.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..2fe7faea
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-clientType.json
|
||||||
|
@@ -0,0 +1,28 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-clientType",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "client type must be string",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": 0,
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "command",
|
||||||
|
+ "tags": {
|
||||||
|
+ "db.system": "mongodb"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-emptyNestedSpan.json b/test/unified-test-format/invalid/expectedTracingSpans-emptyNestedSpan.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..8a98d5ba
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-emptyNestedSpan.json
|
||||||
|
@@ -0,0 +1,29 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-emptyNestedSpan",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "nested spans must not have fewer than 1 items'",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "command",
|
||||||
|
+ "tags": {
|
||||||
|
+ "db.system": "mongodb"
|
||||||
|
+ },
|
||||||
|
+ "nested": []
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-invalidNestedSpan.json b/test/unified-test-format/invalid/expectedTracingSpans-invalidNestedSpan.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..79a86744
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-invalidNestedSpan.json
|
||||||
|
@@ -0,0 +1,31 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-invalidNestedSpan",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "nested span must have required property name",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "command",
|
||||||
|
+ "tags": {
|
||||||
|
+ "db.system": "mongodb"
|
||||||
|
+ },
|
||||||
|
+ "nested": [
|
||||||
|
+ {}
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-missingPropertyClient.json b/test/unified-test-format/invalid/expectedTracingSpans-missingPropertyClient.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..2fb1cd5b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-missingPropertyClient.json
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-missingPropertyClient",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "missing required property client",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "command",
|
||||||
|
+ "tags": {
|
||||||
|
+ "db.system": "mongodb"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-missingPropertySpans.json b/test/unified-test-format/invalid/expectedTracingSpans-missingPropertySpans.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..acd10307
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-missingPropertySpans.json
|
||||||
|
@@ -0,0 +1,20 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-missingPropertySpans",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "missing required property spans",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedAdditionalProperties.json b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedAdditionalProperties.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..17299f86
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedAdditionalProperties.json
|
||||||
|
@@ -0,0 +1,28 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-spanMalformedAdditionalProperties",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "Span must not have additional properties",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "foo",
|
||||||
|
+ "tags": {},
|
||||||
|
+ "nested": [],
|
||||||
|
+ "foo": "bar"
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedMissingName.json b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedMissingName.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..0257cd9b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedMissingName.json
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-spanMalformedMissingName",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "missing required span name",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "tags": {
|
||||||
|
+ "db.system": "mongodb"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedMissingTags.json b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedMissingTags.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..a09ca31c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedMissingTags.json
|
||||||
|
@@ -0,0 +1,25 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-spanMalformedMissingTags",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "missing required span tags",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "foo"
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedNestedMustBeArray.json b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedNestedMustBeArray.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..ccff0410
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedNestedMustBeArray.json
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-spanMalformedNestedMustBeArray",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "nested spans must be an array",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "foo",
|
||||||
|
+ "tags": {},
|
||||||
|
+ "nested": {}
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedTagsMustBeObject.json b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedTagsMustBeObject.json
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..72af1c29
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/unified-test-format/invalid/expectedTracingSpans-spanMalformedTagsMustBeObject.json
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+{
|
||||||
|
+ "description": "expectedTracingSpans-spanMalformedNestedMustBeObject",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
+ "createEntities": [
|
||||||
|
+ {
|
||||||
|
+ "client": {
|
||||||
|
+ "id": "client0"
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "tests": [
|
||||||
|
+ {
|
||||||
|
+ "description": "span tags must be an object",
|
||||||
|
+ "operations": [],
|
||||||
|
+ "expectTracingMessages": {
|
||||||
|
+ "client": "client0",
|
||||||
|
+ "spans": [
|
||||||
|
+ {
|
||||||
|
+ "name": "foo",
|
||||||
|
+ "tags": []
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
@ -1,84 +1,11 @@
|
|||||||
diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
|
diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
|
||||||
index d40cfbb7e..5799e834d 100644
|
index 5799e834..72103b3c 100644
|
||||||
--- a/test/connection_logging/connection-logging.json
|
--- a/test/connection_logging/connection-logging.json
|
||||||
+++ b/test/connection_logging/connection-logging.json
|
+++ b/test/connection_logging/connection-logging.json
|
||||||
@@ -272,7 +272,13 @@
|
@@ -446,6 +446,22 @@
|
||||||
"level": "debug",
|
|
||||||
"component": "connection",
|
|
||||||
"data": {
|
|
||||||
- "message": "Connection pool closed",
|
|
||||||
+ "message": "Connection closed",
|
|
||||||
+ "driverConnectionId": {
|
|
||||||
+ "$$type": [
|
|
||||||
+ "int",
|
|
||||||
+ "long"
|
|
||||||
+ ]
|
|
||||||
+ },
|
|
||||||
"serverHost": {
|
|
||||||
"$$type": "string"
|
|
||||||
},
|
|
||||||
@@ -281,20 +287,15 @@
|
|
||||||
"int",
|
|
||||||
"long"
|
|
||||||
]
|
|
||||||
- }
|
|
||||||
+ },
|
|
||||||
+ "reason": "Connection pool was closed"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"level": "debug",
|
|
||||||
"component": "connection",
|
|
||||||
"data": {
|
|
||||||
- "message": "Connection closed",
|
|
||||||
- "driverConnectionId": {
|
|
||||||
- "$$type": [
|
|
||||||
- "int",
|
|
||||||
- "long"
|
|
||||||
- ]
|
|
||||||
- },
|
|
||||||
+ "message": "Connection pool closed",
|
|
||||||
"serverHost": {
|
|
||||||
"$$type": "string"
|
|
||||||
},
|
|
||||||
@@ -303,8 +304,7 @@
|
|
||||||
"int",
|
|
||||||
"long"
|
|
||||||
]
|
|
||||||
- },
|
|
||||||
- "reason": "Connection pool was closed"
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@@ -446,22 +446,6 @@
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
- {
|
|
||||||
- "level": "debug",
|
|
||||||
- "component": "connection",
|
|
||||||
- "data": {
|
|
||||||
- "message": "Connection pool cleared",
|
|
||||||
- "serverHost": {
|
|
||||||
- "$$type": "string"
|
|
||||||
- },
|
|
||||||
- "serverPort": {
|
|
||||||
- "$$type": [
|
|
||||||
- "int",
|
|
||||||
- "long"
|
|
||||||
- ]
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- },
|
|
||||||
{
|
|
||||||
"level": "debug",
|
|
||||||
"component": "connection",
|
|
||||||
@@ -514,6 +498,22 @@
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ },
|
|
||||||
+ {
|
+ {
|
||||||
+ "level": "debug",
|
+ "level": "debug",
|
||||||
+ "component": "connection",
|
+ "component": "connection",
|
||||||
@ -94,6 +21,30 @@ index d40cfbb7e..5799e834d 100644
|
|||||||
+ ]
|
+ ]
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
|
+ },
|
||||||
|
{
|
||||||
|
"level": "debug",
|
||||||
|
"component": "connection",
|
||||||
|
@@ -498,22 +514,6 @@
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- },
|
||||||
|
- {
|
||||||
|
- "level": "debug",
|
||||||
|
- "component": "connection",
|
||||||
|
- "data": {
|
||||||
|
- "message": "Connection pool cleared",
|
||||||
|
- "serverHost": {
|
||||||
|
- "$$type": "string"
|
||||||
|
- },
|
||||||
|
- "serverPort": {
|
||||||
|
- "$$type": [
|
||||||
|
- "int",
|
||||||
|
- "long"
|
||||||
|
- ]
|
||||||
|
- }
|
||||||
|
- }
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
587
.evergreen/spec-patch/PYTHON-5529.patch
Normal file
587
.evergreen/spec-patch/PYTHON-5529.patch
Normal file
@ -0,0 +1,587 @@
|
|||||||
|
diff --git a/test/csot/command-execution.json b/test/csot/command-execution.json
|
||||||
|
index aa9c3eb2..212cd410 100644
|
||||||
|
--- a/test/csot/command-execution.json
|
||||||
|
+++ b/test/csot/command-execution.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "timeoutMS behaves correctly during command execution",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.4.7",
|
||||||
|
@@ -69,8 +69,10 @@
|
||||||
|
"appName": "reduceMaxTimeMSTest",
|
||||||
|
"w": 1,
|
||||||
|
"timeoutMS": 500,
|
||||||
|
- "heartbeatFrequencyMS": 500
|
||||||
|
+ "heartbeatFrequencyMS": 500,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
]
|
||||||
|
@@ -185,8 +187,10 @@
|
||||||
|
"appName": "rttTooHighTest",
|
||||||
|
"w": 1,
|
||||||
|
"timeoutMS": 10,
|
||||||
|
- "heartbeatFrequencyMS": 500
|
||||||
|
+ "heartbeatFrequencyMS": 500,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
]
|
||||||
|
@@ -316,8 +320,10 @@
|
||||||
|
"appName": "reduceMaxTimeMSTest",
|
||||||
|
"w": 1,
|
||||||
|
"timeoutMS": 90,
|
||||||
|
- "heartbeatFrequencyMS": 100000
|
||||||
|
+ "heartbeatFrequencyMS": 100000,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
]
|
||||||
|
diff --git a/test/csot/convenient-transactions.json b/test/csot/convenient-transactions.json
|
||||||
|
index 3868b302..f9d03429 100644
|
||||||
|
--- a/test/csot/convenient-transactions.json
|
||||||
|
+++ b/test/csot/convenient-transactions.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "timeoutMS behaves correctly for the withTransaction API",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.4",
|
||||||
|
@@ -21,8 +21,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 500
|
||||||
|
+ "timeoutMS": 500,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
diff --git a/test/csot/error-transformations.json b/test/csot/error-transformations.json
|
||||||
|
index 4889e395..89be49f0 100644
|
||||||
|
--- a/test/csot/error-transformations.json
|
||||||
|
+++ b/test/csot/error-transformations.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "MaxTimeMSExpired server errors are transformed into a custom timeout error",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.0",
|
||||||
|
@@ -26,8 +26,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
diff --git a/test/csot/global-timeoutMS.json b/test/csot/global-timeoutMS.json
|
||||||
|
index f1edbe68..9d8046d1 100644
|
||||||
|
--- a/test/csot/global-timeoutMS.json
|
||||||
|
+++ b/test/csot/global-timeoutMS.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "timeoutMS can be configured on a MongoClient",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.4",
|
||||||
|
@@ -38,8 +38,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -217,8 +219,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -390,8 +394,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -569,8 +575,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -762,8 +770,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -941,8 +951,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -1120,8 +1132,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -1305,8 +1319,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -1484,8 +1500,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -1663,8 +1681,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -1842,8 +1862,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -2021,8 +2043,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -2194,8 +2218,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -2375,8 +2401,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -2554,8 +2582,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -2733,8 +2763,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -2906,8 +2938,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -3079,8 +3113,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -3258,8 +3294,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -3441,8 +3479,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -3628,8 +3668,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -3807,8 +3849,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -3986,8 +4030,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -4171,8 +4217,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -4360,8 +4408,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -4549,8 +4599,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -4728,8 +4780,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -4913,8 +4967,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -5102,8 +5158,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -5297,8 +5355,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -5482,8 +5542,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
@@ -5677,8 +5739,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 250
|
||||||
|
+ "timeoutMS": 250,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
diff --git a/test/csot/non-tailable-cursors.json b/test/csot/non-tailable-cursors.json
|
||||||
|
index 291c6e72..58c59cb3 100644
|
||||||
|
--- a/test/csot/non-tailable-cursors.json
|
||||||
|
+++ b/test/csot/non-tailable-cursors.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "timeoutMS behaves correctly for non-tailable cursors",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.4"
|
||||||
|
@@ -17,8 +17,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 200
|
||||||
|
+ "timeoutMS": 200,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
diff --git a/test/csot/retryability-timeoutMS.json b/test/csot/retryability-timeoutMS.json
|
||||||
|
index 9daad260..5a0c9f36 100644
|
||||||
|
--- a/test/csot/retryability-timeoutMS.json
|
||||||
|
+++ b/test/csot/retryability-timeoutMS.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "timeoutMS behaves correctly for retryable operations",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.0",
|
||||||
|
@@ -26,8 +26,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 100
|
||||||
|
+ "timeoutMS": 100,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent"
|
||||||
|
diff --git a/test/csot/runCursorCommand.json b/test/csot/runCursorCommand.json
|
||||||
|
index 36f774fb..e5182e33 100644
|
||||||
|
--- a/test/csot/runCursorCommand.json
|
||||||
|
+++ b/test/csot/runCursorCommand.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "runCursorCommand",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.4"
|
||||||
|
@@ -16,6 +16,10 @@
|
||||||
|
{
|
||||||
|
"client": {
|
||||||
|
"id": "commandClient",
|
||||||
|
+ "uriOptions": {
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
+ },
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent",
|
||||||
|
diff --git a/test/csot/sessions-inherit-timeoutMS.json b/test/csot/sessions-inherit-timeoutMS.json
|
||||||
|
index 13ea91c7..dbf163e4 100644
|
||||||
|
--- a/test/csot/sessions-inherit-timeoutMS.json
|
||||||
|
+++ b/test/csot/sessions-inherit-timeoutMS.json
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
{
|
||||||
|
"description": "sessions inherit timeoutMS from their parent MongoClient",
|
||||||
|
- "schemaVersion": "1.9",
|
||||||
|
+ "schemaVersion": "1.26",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"minServerVersion": "4.4",
|
||||||
|
@@ -21,8 +21,10 @@
|
||||||
|
"client": {
|
||||||
|
"id": "client",
|
||||||
|
"uriOptions": {
|
||||||
|
- "timeoutMS": 500
|
||||||
|
+ "timeoutMS": 500,
|
||||||
|
+ "minPoolSize": 1
|
||||||
|
},
|
||||||
|
+ "awaitMinPoolSizeMS": 10000,
|
||||||
|
"useMultipleMongoses": false,
|
||||||
|
"observeEvents": [
|
||||||
|
"commandStartedEvent",
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"description": "runOnRequirement-csfle-minLibmongocryptVersion-pattern",
|
||||||
|
"schemaVersion": "1.25",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"csfle": {
|
||||||
|
"minLibmongocryptVersion": "1.2.3.4"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tests": [
|
||||||
|
{
|
||||||
|
"description": "foo",
|
||||||
|
"operations": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"description": "runOnRequirement-csfle-minLibmongocryptVersion-type",
|
||||||
|
"schemaVersion": "1.25",
|
||||||
|
"runOnRequirements": [
|
||||||
|
{
|
||||||
|
"csfle": {
|
||||||
|
"minLibmongocryptVersion": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tests": [
|
||||||
|
{
|
||||||
|
"description": "foo",
|
||||||
|
"operations": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user