Skip to content

Commit d08adff

Browse files
authored
Remove incorrect test-skipping logic (#1186)
Skip newly-running but failing tests in code JAVA-5124 JAVA-5125
1 parent dcd03d0 commit d08adff

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
import java.util.List;
4646
import java.util.concurrent.TimeUnit;
4747

48-
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
48+
import static com.mongodb.ClusterFixture.isSharded;
49+
import static com.mongodb.ClusterFixture.serverVersionLessThan;
4950
import static com.mongodb.JsonTestServerVersionChecker.skipTest;
5051
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
5152
import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
@@ -89,6 +90,11 @@ protected BsonDocument getDefinition() {
8990
@Before
9091
public void setUp() {
9192
assumeFalse(skipTest);
93+
// Remove this as part of JAVA-5125
94+
if (isSharded() && serverVersionLessThan(5, 0)) {
95+
assumeFalse(description.contains("succeeds after WriteConcernError"));
96+
assumeFalse(description.contains("fails after multiple retryable writeConcernErrors"));
97+
}
9298
collectionHelper = new CollectionHelper<>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
9399
BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
94100
MongoClientSettings.Builder builder = getMongoClientSettingsBuilder();
@@ -254,7 +260,7 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
254260
data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
255261
testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
256262
testDocument.getArray("data"), test.asDocument(),
257-
!isDiscoverableReplicaSet() || skipTest(testDocument, test.asDocument())});
263+
skipTest(testDocument, test.asDocument())});
258264
}
259265
}
260266
return data;

0 commit comments

Comments
 (0)