From acb17d016401326b297ec3f73addb8397705a9e7 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Thu, 4 Feb 2021 11:17:57 -0500 Subject: [PATCH] Limit geoHaystack index testing to MongoDB 4.4 and below The next release after MongoDB 4.4 removes support for geoHaystack indexes, so we need to disable tests of them in the driver when running against server versions > 4.4. --- .../mongodb/client/model/IndexesFunctionalSpecification.groovy | 3 +++ .../operation/CreateIndexesOperationSpecification.groovy | 2 ++ 2 files changed, 5 insertions(+) diff --git a/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy index cc1f05ce364..7a33ccf3413 100644 --- a/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy @@ -17,7 +17,9 @@ package com.mongodb.client.model import com.mongodb.OperationFunctionalSpecification +import spock.lang.IgnoreIf +import static com.mongodb.ClusterFixture.serverVersionGreaterThan import static com.mongodb.client.model.Indexes.ascending import static com.mongodb.client.model.Indexes.compoundIndex import static com.mongodb.client.model.Indexes.descending @@ -98,6 +100,7 @@ class IndexesFunctionalSpecification extends OperationFunctionalSpecification { getCollectionHelper().listIndexes()*.get('key').contains(parse('{x : "2d"}')) } + @IgnoreIf({ serverVersionGreaterThan('4.4') }) def 'geoHaystack'() { when: getCollectionHelper().createIndex(geoHaystack('x', descending('b')), 2.0) diff --git a/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy index 9eeee686d65..5ff94ccceb8 100644 --- a/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy +++ b/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy @@ -39,6 +39,7 @@ import static com.mongodb.ClusterFixture.getBinding import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet import static com.mongodb.ClusterFixture.isSharded import static com.mongodb.ClusterFixture.serverVersionAtLeast +import static com.mongodb.ClusterFixture.serverVersionGreaterThan import static java.util.concurrent.TimeUnit.SECONDS class CreateIndexesOperationSpecification extends OperationFunctionalSpecification { @@ -291,6 +292,7 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati async << [true, false] } + @IgnoreIf({ serverVersionGreaterThan('4.4') }) def 'should be able to create a geoHaystack indexes'() { given: def operation = new CreateIndexesOperation(getNamespace(),