Skip to content

Commit 31b2277

Browse files
committed
PYTHON-3024 Update estimatedDocumentCount test for Atlas Data Lake (#802)
Migrate data lake testing to RHEL 7. Ensure mongohouse downloads the right build via VARIANT. (cherry picked from commit 64a4f6e)
1 parent cbdb5fe commit 31b2277

File tree

6 files changed

+28
-9
lines changed

6 files changed

+28
-9
lines changed

.evergreen/config.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,9 @@ functions:
309309
script: |
310310
set -o xtrace
311311
${PREPARE_SHELL}
312-
bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
312+
# The mongohouse build script needs to be passed the VARIANT variable, see
313+
# https://github.com/10gen/mongohouse/blob/973cc11/evergreen.yaml#L31
314+
VARIANT=rhel7 bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
313315
- command: shell.exec
314316
type: setup
315317
params:
@@ -2795,8 +2797,8 @@ buildvariants:
27952797

27962798
- matrix_name: "data-lake-spec-tests"
27972799
matrix_spec:
2798-
platform: ubuntu-16.04
2799-
python-version: ["2.7", "3.4", "3.8"]
2800+
platform: rhel70
2801+
python-version: ["2.7", "3.4", "3.6"]
28002802
auth: "auth"
28012803
c-extensions: "*"
28022804
display_name: "Atlas Data Lake ${python-version} ${c-extensions}"

test/data_lake/estimatedDocumentCount.json

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,25 @@
1515
{
1616
"command_started_event": {
1717
"command": {
18-
"count": "driverdata"
19-
}
18+
"aggregate": "driverdata",
19+
"pipeline": [
20+
{
21+
"$collStats": {
22+
"count": {}
23+
}
24+
},
25+
{
26+
"$group": {
27+
"_id": 1,
28+
"n": {
29+
"$sum": "$count"
30+
}
31+
}
32+
}
33+
]
34+
},
35+
"command_name": "aggregate",
36+
"database_name": "test"
2037
}
2138
}
2239
]

test/data_lake/getMore.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454
]
5555
}
5656
]
57-
}
57+
}

test/data_lake/listCollections.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
]
2323
}
2424
]
25-
}
25+
}

test/data_lake/listDatabases.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
]
2222
}
2323
]
24-
}
24+
}

test/data_lake/runCommand.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
]
2929
}
3030
]
31-
}
31+
}

0 commit comments

Comments
 (0)