Skip to content

Commit 64a4f6e

Browse files
authored
PYTHON-3024 Update estimatedDocumentCount test for Atlas Data Lake (#802)
Migrate data lake testing to ubuntu 18. Ensure mongohouse downloads the right build via VARIANT.
1 parent 2af521e commit 64a4f6e

6 files changed

+27
-8
lines changed

.evergreen/config.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,9 @@ functions:
310310
script: |
311311
set -o xtrace
312312
${PREPARE_SHELL}
313-
bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
313+
# The mongohouse build script needs to be passed the VARIANT variable, see
314+
# https://github.com/10gen/mongohouse/blob/973cc11/evergreen.yaml#L65
315+
VARIANT=ubuntu1804 bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/build-mongohouse-local.sh
314316
- command: shell.exec
315317
type: setup
316318
params:
@@ -2439,7 +2441,7 @@ buildvariants:
24392441

24402442
- matrix_name: "data-lake-spec-tests"
24412443
matrix_spec:
2442-
platform: ubuntu-16.04
2444+
platform: ubuntu-18.04
24432445
python-version: ["3.6", "3.9"]
24442446
auth: "auth"
24452447
c-extensions: "*"

test/data_lake/estimatedDocumentCount.json

+19-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454
]
5555
}
5656
]
57-
}
57+
}

test/data_lake/listCollections.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
]
2323
}
2424
]
25-
}
25+
}

test/data_lake/listDatabases.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
]
2222
}
2323
]
24-
}
24+
}

test/data_lake/runCommand.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
]
2929
}
3030
]
31-
}
31+
}

0 commit comments

Comments
 (0)