From f2442071681bc29957682348a3e01e83741c4f97 Mon Sep 17 00:00:00 2001 From: Bastien Gerard Date: Wed, 3 Mar 2021 11:40:39 +0100 Subject: [PATCH] fix mongo download link for 4.2 4.4 explicitly --- .github/workflows/github-actions.yml | 6 +++--- .github/workflows/install_mongo.sh | 11 +++++++---- .github/workflows/start_mongo.sh | 3 ++- mongoengine/mongodb_support.py | 1 + tests/document/test_indexes.py | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 4ee0fd37..bfdfa3a4 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -13,8 +13,8 @@ on: env: MONGODB_3_6: 3.6.14 MONGODB_4_0: 4.0.23 - MONGODB_4_2: 4.2.12 - MONGODB_4_4: 4.4.4 + MONGODB_4_2: 4.2 + MONGODB_4_4: 4.4 PYMONGO_3_4: 3.4 PYMONGO_3_6: 3.6 @@ -52,7 +52,7 @@ jobs: MONGODB: $MONGODB_3_6 PYMONGO: $PYMONGO_3_9 - python-version: 3.7 - MONGODB: MONGODB_4_2 + MONGODB: $MONGODB_4_2 PYMONGO: $PYMONGO_3_6 - python-version: 3.7 MONGODB: $MONGODB_4_4 diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh index 5f486666..136f5c20 100644 --- a/.github/workflows/install_mongo.sh +++ b/.github/workflows/install_mongo.sh @@ -5,11 +5,14 @@ MONGODB=$1 # Mongo > 4.0 follows different name convention for download links mongo_build=mongodb-linux-x86_64-${MONGODB} -if [[ "$MONGODB" == *"4."* ]] && [[ ! "$MONGODB" == *"4.0"* ]]; then - echo "It's there." - mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest +if [[ "$MONGODB" == *"4.2"* ]]; then + mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest +elif [[ "$MONGODB" == *"4.4"* ]]; then + mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest fi wget http://fastdl.mongodb.org/linux/$mongo_build.tgz tar xzf $mongo_build.tgz -${PWD}/$mongo_build/bin/mongod --version + +mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*") +$mongodb_dir/bin/mongod --version diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh index dc844dbd..800004c8 100644 --- a/.github/workflows/start_mongo.sh +++ b/.github/workflows/start_mongo.sh @@ -2,7 +2,8 @@ MONGODB=$1 -mongodb_dir=${PWD}/mongodb-linux-x86_64-${MONGODB} +mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*") + mkdir $mongodb_dir/data $mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork mongo --eval 'db.version();' # Make sure mongo is awake diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py index df51100d..8c5b3e5d 100644 --- a/mongoengine/mongodb_support.py +++ b/mongoengine/mongodb_support.py @@ -8,6 +8,7 @@ from mongoengine.connection import get_connection # get_mongodb_version() MONGODB_34 = (3, 4) MONGODB_36 = (3, 6) +MONGODB_42 = (4, 2) MONGODB_44 = (4, 4) diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py index 17643dd8..2de9307d 100644 --- a/tests/document/test_indexes.py +++ b/tests/document/test_indexes.py @@ -7,7 +7,7 @@ import pytest from mongoengine import * from mongoengine.connection import get_db -from mongoengine.mongodb_support import MONGODB_44, get_mongodb_version +from mongoengine.mongodb_support import MONGODB_42, get_mongodb_version class TestIndexes(unittest.TestCase): @@ -454,7 +454,7 @@ class TestIndexes(unittest.TestCase): == "IXSCAN" ) mongo_db = get_mongodb_version() - PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_44 else "PROJECTION_COVERED" + PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED" assert ( query_plan.get("queryPlanner").get("winningPlan").get("stage") == PROJECTION_STR