Skip to content

Commit 8c67732

Browse files
committed
Ignore new client-side encryption tests
* when not at least Java 8 * when server version is not at least 4.1
1 parent b8c5851 commit 8c67732

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionMongocryptdSpawnBypassTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@
2929
import java.util.HashMap;
3030
import java.util.Map;
3131

32+
import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
3233
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
3334
import static java.util.Arrays.asList;
3435
import static org.junit.Assert.assertFalse;
36+
import static org.junit.Assume.assumeFalse;
3537
import static org.junit.Assume.assumeTrue;
3638

3739

@@ -41,7 +43,9 @@ public class ClientSideEncryptionMongocryptdSpawnBypassTest extends DatabaseTest
4143
private final MongoNamespace keyVaultNamespace = new MongoNamespace("admin.datakeys");
4244

4345
public ClientSideEncryptionMongocryptdSpawnBypassTest() throws IOException {
44-
super();
46+
assumeFalse(isNotAtLeastJava8());
47+
assumeTrue(serverVersionAtLeast(4, 2));
48+
4549
pidFile = new File("bypass-spawning-mongocryptd.pid");
4650

4751
byte[] localMasterKey = new byte[96];

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@
2828
import java.util.HashMap;
2929
import java.util.Map;
3030

31+
import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
3132
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
3233
import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
3334
import static java.util.Arrays.asList;
3435
import static org.junit.Assert.assertFalse;
36+
import static org.junit.Assume.assumeFalse;
3537
import static org.junit.Assume.assumeTrue;
3638

3739

@@ -41,7 +43,9 @@ public class ClientSideEncryptionMongocryptdSpawnBypassTest extends DatabaseTest
4143
private final MongoNamespace keyVaultNamespace = new MongoNamespace("admin.datakeys");
4244

4345
public ClientSideEncryptionMongocryptdSpawnBypassTest() throws IOException {
44-
super();
46+
assumeFalse(isNotAtLeastJava8());
47+
assumeTrue(serverVersionAtLeast(4, 2));
48+
4549
pidFile = new File("bypass-spawning-mongocryptd.pid");
4650

4751
byte[] localMasterKey = new byte[96];

0 commit comments

Comments
 (0)