Skip to content

Commit 7a25761

Browse files
NoahStappNoahStapp
authored
Merge branch 'master' into PYTHON-5395 
2 parents 9dc5b86 + f7b94be commit 7a25761

File tree

105 files changed

+2716
-8565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2716
-8565
lines changed

‎.evergreen/generated_configs/variants.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,55 +535,71 @@ buildvariants:
535535
display_name: "* MongoDB v4.2"
536536
run_on:
537537
- rhel87-small
538+
expansions:
539+
VERSION: "4.2"
538540
tags: [coverage_tag]
539541
- name: mongodb-v4.4
540542
tasks:
541543
- name: .server-version
542544
display_name: "* MongoDB v4.4"
543545
run_on:
544546
- rhel87-small
547+
expansions:
548+
VERSION: "4.4"
545549
tags: [coverage_tag]
546550
- name: mongodb-v5.0
547551
tasks:
548552
- name: .server-version
549553
display_name: "* MongoDB v5.0"
550554
run_on:
551555
- rhel87-small
556+
expansions:
557+
VERSION: "5.0"
552558
tags: [coverage_tag]
553559
- name: mongodb-v6.0
554560
tasks:
555561
- name: .server-version
556562
display_name: "* MongoDB v6.0"
557563
run_on:
558564
- rhel87-small
565+
expansions:
566+
VERSION: "6.0"
559567
tags: [coverage_tag]
560568
- name: mongodb-v7.0
561569
tasks:
562570
- name: .server-version
563571
display_name: "* MongoDB v7.0"
564572
run_on:
565573
- rhel87-small
574+
expansions:
575+
VERSION: "7.0"
566576
tags: [coverage_tag]
567577
- name: mongodb-v8.0
568578
tasks:
569579
- name: .server-version
570580
display_name: "* MongoDB v8.0"
571581
run_on:
572582
- rhel87-small
583+
expansions:
584+
VERSION: "8.0"
573585
tags: [coverage_tag]
574586
- name: mongodb-rapid
575587
tasks:
576588
- name: .server-version
577589
display_name: "* MongoDB rapid"
578590
run_on:
579591
- rhel87-small
592+
expansions:
593+
VERSION: rapid
580594
tags: [coverage_tag]
581595
- name: mongodb-latest
582596
tasks:
583597
- name: .server-version
584598
display_name: "* MongoDB latest"
585599
run_on:
586600
- rhel87-small
601+
expansions:
602+
VERSION: latest
587603
tags: [coverage_tag]
588604

589605
# Stable api tests

‎.evergreen/remove-unimplemented-tests.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ PYMONGO=$(dirname "$(cd "$(dirname "$0")" || exit; pwd)")
33

44
rm $PYMONGO/test/transactions/legacy/errors-client.json # PYTHON-1894
55
rm $PYMONGO/test/connection_monitoring/wait-queue-fairness.json # PYTHON-1873
6-
rm $PYMONGO/test/client-side-encryption/spec/unified/fle2v2-BypassQueryAnalysis.json # PYTHON-5143
7-
rm $PYMONGO/test/client-side-encryption/spec/unified/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json # PYTHON-5143
8-
rm $PYMONGO/test/client-side-encryption/spec/unified/localSchema.json # PYTHON-5143
9-
rm $PYMONGO/test/client-side-encryption/spec/unified/maxWireVersion.json # PYTHON-5143
10-
rm $PYMONGO/test/unified-test-format/valid-pass/poc-queryable-encryption.json # PYTHON-5143
116
rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-application-error.json # PYTHON-4918
127
rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-checkout-error.json # PYTHON-4918
138
rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-min-pool-size-error.json # PYTHON-4918

‎.evergreen/run-mongodb-oidc-test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ if [ ${OIDC_ENV} == "k8s" ]; then
88
SUB_TEST_NAME=$K8S_VARIANT-remote
99
else
1010
SUB_TEST_NAME=$OIDC_ENV-remote
11+
sudo apt-get install -y python3-dev build-essential
1112
fi
13+
1214
bash ./.evergreen/just.sh setup-tests auth_oidc $SUB_TEST_NAME
1315
bash ./.evergreen/just.sh run-tests "${@:1}"
1416

‎.evergreen/scripts/generate_config.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ def create_server_version_variants() -> list[BuildVariant]:
7474
for version in ALL_VERSIONS:
7575
display_name = get_variant_name("* MongoDB", version=version)
7676
variant = create_variant(
77-
[".server-version"], display_name, host=DEFAULT_HOST, tags=["coverage_tag"]
77+
[".server-version"],
78+
display_name,
79+
version=version,
80+
host=DEFAULT_HOST,
81+
tags=["coverage_tag"],
7882
)
7983
variants.append(variant)
8084
return variants

‎.evergreen/scripts/install-dependencies.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ if ! command -v just &>/dev/null; then
4848
_TARGET="--target x86_64-pc-windows-msvc"
4949
fi
5050
_BIN_DIR=$PYMONGO_BIN_DIR
51+
mkdir -p ${_BIN_DIR}
5152
echo "Installing just..."
5253
mkdir -p "$_BIN_DIR" 2>/dev/null || true
5354
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
55+
# Remove just file if it exists (can be created if there was an install error).
56+
rm -f ${_BIN_DIR}/just
5457
_pip_install rust-just just
5558
}
5659
echo "Installing just... done."
@@ -59,6 +62,7 @@ fi
5962
# Ensure uv is installed.
6063
if ! command -v uv &>/dev/null; then
6164
_BIN_DIR=$PYMONGO_BIN_DIR
65+
mkdir -p ${_BIN_DIR}
6266
echo "Installing uv..."
6367
# On most systems we can install directly.
6468
curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {

‎.evergreen/scripts/kms_tester.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ def _setup_azure_vm(base_env: dict[str, str]) -> None:
3030
env["AZUREKMS_CMD"] = "tar xf mongo-python-driver.tgz"
3131
run_command(f"{azure_dir}/run-command.sh", env=env)
3232

33+
env["AZUREKMS_CMD"] = "sudo apt-get install -y python3-dev build-essential"
34+
run_command(f"{azure_dir}/run-command.sh", env=env)
35+
3336
env["AZUREKMS_CMD"] = "bash .evergreen/just.sh setup-tests kms azure-remote"
3437
run_command(f"{azure_dir}/run-command.sh", env=env)
3538
LOGGER.info("Setting up Azure VM... done.")
@@ -47,6 +50,9 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None:
4750
env["GCPKMS_CMD"] = "tar xf mongo-python-driver.tgz"
4851
run_command(f"{gcp_dir}/run-command.sh", env=env)
4952

53+
env["GCPKMS_CMD"] = "sudo apt-get install -y python3-dev build-essential"
54+
run_command(f"{gcp_dir}/run-command.sh", env=env)
55+
5056
env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-tests kms gcp-remote"
5157
run_command(f"{gcp_dir}/run-command.sh", env=env)
5258
LOGGER.info("Setting up GCP VM...")

‎.evergreen/scripts/oidc_tester.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22

33
import os
44

5-
from utils import DRIVERS_TOOLS, TMP_DRIVER_FILE, create_archive, read_env, run_command, write_env
5+
from utils import (
6+
DRIVERS_TOOLS,
7+
TMP_DRIVER_FILE,
8+
create_archive,
9+
read_env,
10+
run_command,
11+
write_env,
12+
)
613

714
K8S_NAMES = ["aks", "gke", "eks"]
815
K8S_REMOTE_NAMES = [f"{n}-remote" for n in K8S_NAMES]

‎.evergreen/spec-patch/PYTHON-5493.patch

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
2+
index d40cfbb7e..5799e834d 100644
3+
--- a/test/connection_logging/connection-logging.json
4+
+++ b/test/connection_logging/connection-logging.json
5+
@@ -272,7 +272,13 @@
6+
"level": "debug",
7+
"component": "connection",
8+
"data": {
9+
- "message": "Connection pool closed",
10+
+ "message": "Connection closed",
11+
+ "driverConnectionId": {
12+
+ "$$type": [
13+
+ "int",
14+
+ "long"
15+
+ ]
16+
+ },
17+
"serverHost": {
18+
"$$type": "string"
19+
},
20+
@@ -281,20 +287,15 @@
21+
"int",
22+
"long"
23+
]
24+
- }
25+
+ },
26+
+ "reason": "Connection pool was closed"
27+
}
28+
},
29+
{
30+
"level": "debug",
31+
"component": "connection",
32+
"data": {
33+
- "message": "Connection closed",
34+
- "driverConnectionId": {
35+
- "$$type": [
36+
- "int",
37+
- "long"
38+
- ]
39+
- },
40+
+ "message": "Connection pool closed",
41+
"serverHost": {
42+
"$$type": "string"
43+
},
44+
@@ -303,8 +304,7 @@
45+
"int",
46+
"long"
47+
]
48+
- },
49+
- "reason": "Connection pool was closed"
50+
+ }
51+
}
52+
}
53+
]
54+
@@ -446,22 +446,6 @@
55+
}
56+
}
57+
},
58+
- {
59+
- "level": "debug",
60+
- "component": "connection",
61+
- "data": {
62+
- "message": "Connection pool cleared",
63+
- "serverHost": {
64+
- "$$type": "string"
65+
- },
66+
- "serverPort": {
67+
- "$$type": [
68+
- "int",
69+
- "long"
70+
- ]
71+
- }
72+
- }
73+
- },
74+
{
75+
"level": "debug",
76+
"component": "connection",
77+
@@ -514,6 +498,22 @@
78+
]
79+
}
80+
}
81+
+ },
82+
+ {
83+
+ "level": "debug",
84+
+ "component": "connection",
85+
+ "data": {
86+
+ "message": "Connection pool cleared",
87+
+ "serverHost": {
88+
+ "$$type": "string"
89+
+ },
90+
+ "serverPort": {
91+
+ "$$type": [
92+
+ "int",
93+
+ "long"
94+
+ ]
95+
+ }
96+
+ }
97+
}
98+
]
99+
}

0 commit comments

Comments
 (0)