Skip to content

Commit 7b3484e

Browse files
authored
Remove atlas data lake tests (#1815)
JAVA-5936
1 parent cf416b3 commit 7b3484e

File tree

9 files changed

+2
-260
lines changed

9 files changed

+2
-260
lines changed

.evergreen/.evg.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,18 +1469,6 @@ tasks:
14691469
OCSP_MUST_STAPLE: "false"
14701470
OCSP_TLS_SHOULD_SUCCEED: "0"
14711471

1472-
- name: "atlas-data-lake-task"
1473-
commands:
1474-
- func: "assume-aws-test-secrets-role"
1475-
- func: "start-mongohoused"
1476-
- command: shell.exec
1477-
type: "test"
1478-
params:
1479-
working_dir: "src"
1480-
script: |
1481-
${PREPARE_SHELL}
1482-
JAVA_VERSION=${JAVA_VERSION} .evergreen/run-atlas-data-lake-test.sh
1483-
14841472
- name: "atlas-search-task"
14851473
commands:
14861474
- command: shell.exec
@@ -2286,12 +2274,6 @@ buildvariants:
22862274
- name: "atlas-connectivity-task"
22872275
- name: "atlas-x509-auth-test-task"
22882276

2289-
- name: "atlas-data-lake-test"
2290-
display_name: "Atlas Data Lake test"
2291-
run_on: "ubuntu2204-small"
2292-
tasks:
2293-
- name: "atlas-data-lake-task"
2294-
22952277
- name: "reactive-streams-tck-test"
22962278
display_name: "Reactive Streams TCK tests"
22972279
run_on: rhel80-small

.evergreen/run-atlas-data-lake-test.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

driver-core/src/test/functional/com/mongodb/ClusterFixture.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ public final class ClusterFixture {
120120
public static final String MONGODB_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.uri";
121121
public static final String MONGODB_API_VERSION = "org.mongodb.test.api.version";
122122
public static final String MONGODB_MULTI_MONGOS_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.multi.mongos.uri";
123-
public static final String DATA_LAKE_TEST_SYSTEM_PROPERTY_NAME = "org.mongodb.test.data.lake";
124123
public static final String ATLAS_SEARCH_TEST_SYSTEM_PROPERTY_NAME = "org.mongodb.test.atlas.search";
125124
private static final String MONGODB_OCSP_SHOULD_SUCCEED = "org.mongodb.test.ocsp.tls.should.succeed";
126125
private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
@@ -307,11 +306,6 @@ public static synchronized ConnectionString getMultiMongosConnectionString() {
307306
return getConnectionStringFromSystemProperty(MONGODB_MULTI_MONGOS_URI_SYSTEM_PROPERTY_NAME);
308307
}
309308

310-
public static synchronized boolean isDataLakeTest() {
311-
String isDataLakeSystemProperty = System.getProperty(DATA_LAKE_TEST_SYSTEM_PROPERTY_NAME);
312-
return "true".equals(isDataLakeSystemProperty);
313-
}
314-
315309
public static synchronized ConnectionString getConnectionString() {
316310
if (connectionString != null) {
317311
return connectionString;

driver-sync/src/examples/documentation/TransactionExample.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.junit.Before;
3737
import org.junit.Test;
3838

39-
import static com.mongodb.ClusterFixture.isDataLakeTest;
4039
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
4140
import static com.mongodb.ClusterFixture.isSharded;
4241
import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
@@ -47,7 +46,7 @@ public class TransactionExample {
4746

4847
@Before
4948
public void setUp() {
50-
assumeTrue(canRunTest());
49+
assumeTrue(isSharded() || isDiscoverableReplicaSet());
5150
MongoClientSettings.Builder builder = getMongoClientSettingsBuilder()
5251
.applyConnectionString(new ConnectionString(
5352
"mongodb://localhost,localhost:27018,localhost:27019/?serverSelectionTimeoutMS=5000"));
@@ -163,11 +162,4 @@ private void createCollection(final MongoClient client, final String dbName, fin
163162
}
164163
}
165164

166-
private boolean canRunTest() {
167-
if (isDataLakeTest()) {
168-
return false;
169-
} else {
170-
return isSharded() || isDiscoverableReplicaSet();
171-
}
172-
}
173165
}

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

Lines changed: 0 additions & 80 deletions
This file was deleted.

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

Lines changed: 0 additions & 80 deletions
This file was deleted.

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
import java.util.stream.Collectors;
8080

8181
import static com.mongodb.ClusterFixture.getServerVersion;
82-
import static com.mongodb.ClusterFixture.isDataLakeTest;
8382
import static com.mongodb.client.Fixture.getMongoClient;
8483
import static com.mongodb.client.Fixture.getMongoClientSettings;
8584
import static com.mongodb.client.test.CollectionHelper.getCurrentClusterTime;
@@ -284,9 +283,7 @@ public void setUp(
284283
throw new TestAbortedException(definition.getString("skipReason").getValue());
285284
}
286285

287-
if (!isDataLakeTest()) {
288-
killAllSessions();
289-
}
286+
killAllSessions();
290287

291288
startingClusterTime = addInitialDataAndGetClusterTime();
292289

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.function.Function;
2525
import java.util.function.Supplier;
2626

27-
import static com.mongodb.ClusterFixture.isDataLakeTest;
2827
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
2928
import static com.mongodb.ClusterFixture.isSharded;
3029
import static com.mongodb.ClusterFixture.serverVersionLessThan;
@@ -41,12 +40,6 @@
4140
public final class UnifiedTestModifications {
4241
public static void applyCustomizations(final TestDef def) {
4342

44-
// atlas-data-lake
45-
46-
def.skipAccordingToSpec("Data lake tests should only run on data lake")
47-
.when(() -> !isDataLakeTest())
48-
.directory("atlas-data-lake-testing");
49-
5043
// change-streams
5144
def.skipNoncompliantReactive("error required from change stream initialization") // TODO-JAVA-5711 reason?
5245
.test("change-streams", "change-streams", "Test with document comment - pre 4.4");
@@ -191,9 +184,6 @@ public static void applyCustomizations(final TestDef def) {
191184
.test("command-logging-and-monitoring/tests/monitoring", "find",
192185
"A successful find event with a getmore and the server kills the cursor (<= 4.4)");
193186

194-
def.skipNoncompliant("The driver doesn't reduce the batchSize for the getMore")
195-
.test("atlas-data-lake-testing", "getMore", "A successful find event with getMore");
196-
197187
// connection-monitoring-and-pooling
198188
def.skipNoncompliant("According to the test, we should clear the pool then close the connection. Our implementation"
199189
+ "immediately closes the failed connection, then clears the pool.")

0 commit comments

Comments
 (0)