Skip to content

Commit aad04d1

Browse files
rozzanhachicha
andauthored
Update Specs to latest (#2001)
* Update the Git specifications submodule from 4484038 to d4d0cdf2 --------- Co-authored-by: Nabil Hachicha <nabil.hachicha@mongodb.com>
1 parent 4d81e85 commit aad04d1

3 files changed

Lines changed: 24 additions & 1 deletion

File tree

driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionExplicitEncryptionTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
import static com.mongodb.ClusterFixture.isStandalone;
4545
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
46+
import static com.mongodb.ClusterFixture.serverVersionLessThan;
4647
import static com.mongodb.client.Fixture.getDefaultDatabase;
4748
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
4849
import static com.mongodb.client.Fixture.getMongoClient;
@@ -138,6 +139,10 @@ public void canInsertEncryptedIndexedAndFind() {
138139

139140
@Test
140141
public void canInsertEncryptedIndexedAndFindWithNonZeroContention() {
142+
// JAVA-6237: this test inserts with contentionFactor 10 but encryptedFields.json configures the
143+
// encryptedIndexed field with contention 0. Servers >= 9.0 reject this mismatch (SERVER-91887);
144+
// skip until the spec prose test is corrected (DRIVERS-3547).
145+
assumeTrue(serverVersionLessThan(9, 0));
141146
EncryptOptions encryptOptions = new EncryptOptions("Indexed").keyId(key1Id).contentionFactor(10L);
142147
MongoCollection<BsonDocument> coll = encryptedClient.getDatabase(getDefaultDatabaseName())
143148
.getCollection("explicit_encryption", BsonDocument.class);

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,18 @@ public static void applyCustomizations(final TestDef def) {
6363
// Client side encryption (QE)
6464
def.skipJira("https://jira.mongodb.org/browse/JAVA-5675 Support QE with Client.bulkWrite")
6565
.file("client-side-encryption/tests/unified", "client bulkWrite with queryable encryption");
66+
def.skipJira("https://jira.mongodb.org/browse/JAVA-6244 QE GA \"substring\" query type is not yet "
67+
+ "implemented (DRIVERS-3540)")
68+
.file("client-side-encryption/tests/unified", "QE-Text-substring");
6669

6770
// client-side-operation-timeout (CSOT)
71+
// The expected change stream timeout-refresh behaviour is unspecified on server 9.0+ (DRIVERS-3006), so the
72+
// CSOT suite fails there (most visibly on sharded clusters, where extra mongos round-trips exceed the tight
73+
// timeoutMS). Skip the suite on 9.0+ until the spec is clarified.
74+
def.skipJira("https://jira.mongodb.org/browse/JAVA-6078 change stream timeout-refresh behaviour is "
75+
+ "unspecified on server 9.0+ (DRIVERS-3006)")
76+
.when(() -> !serverVersionLessThan(9, 0))
77+
.directory("client-side-operations-timeout");
6878
def.retry("Unified CSOT tests do not account for RTT which varies in TLS vs non-TLS runs")
6979
.whenFailureContains("timeout")
7080
.test("client-side-operations-timeout",
@@ -473,6 +483,14 @@ public static void applyCustomizations(final TestDef def) {
473483
.file("transactions", "backpressure-retryable-commit");
474484
def.skipJira("https://jira.mongodb.org/browse/JAVA-5956 TODO-JAVA-5956")
475485
.file("transactions", "backpressure-retryable-abort");
486+
def.skipJira("https://jira.mongodb.org/browse/JAVA-6179")
487+
.test("transactions", "retryable-writes", "increment txnNumber")
488+
.test("transactions", "commit", "reset session state commit")
489+
.test("transactions", "commit", "reset session state abort")
490+
.test("transactions-convenient-api", "callback-commits",
491+
"withTransaction still succeeds if callback commits and runs extra op")
492+
.test("transactions-convenient-api", "callback-aborts",
493+
"withTransaction still succeeds if callback aborts and runs extra op");
476494

477495
// valid-pass
478496

testing/resources/specifications

Submodule specifications updated 189 files

0 commit comments

Comments
 (0)