From e90c5bad2c4c5cace0b5328db840b4b3a34974e7 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 25 May 2018 08:33:21 +0200 Subject: [PATCH] DATAMONGO-1987 - Upgrade test infrastructure to MongoDB 4.0-rc0 Also make sure to use WriteConcern.MAJORITY when (re)creating collections in test setup. --- .travis.yml | 2 +- .../springframework/data/mongodb/test/util/MongoTestUtils.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b39d92e33..471e86e73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: matrix: - PROFILE=ci global: - - MONGO_VERSION=3.7.9 + - MONGO_VERSION=4.0.0-rc0 addons: apt: diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java index 18fad010c..a3493c34b 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java @@ -44,7 +44,8 @@ public class MongoTestUtils { public static MongoCollection createOrReplaceCollection(String dbName, String collectionName, com.mongodb.MongoClient client) { - MongoDatabase database = client.getDatabase(dbName); + MongoDatabase database = client.getDatabase(dbName).withWriteConcern(WriteConcern.MAJORITY) + .withReadPreference(ReadPreference.primary()); boolean collectionExists = database.listCollections().filter(new Document("name", collectionName)).first() != null;