Skip to content

Fix instant resolution issue for ClusterEventProducerTest on Windows #3310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HoustonPutman merged 2 commits into from
Apr 8, 2025
Merged

Fix instant resolution issue for ClusterEventProducerTest on Windows #3310

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
003fdbd
Fix instant resolution issue for ClusterEventProducerTest on Windows
HoustonPutman Apr 4, 2025
1ef6c65
tidy
HoustonPutman Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions solr/core/src/test/org/apache/solr/cluster/events/ClusterEventProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Phaser;
import java.util.concurrent.TimeUnit;
import org.apache.commons.exec.OS;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.V2Request;
import org.apache.solr.client.solrj.request.beans.PluginMeta;
Expand Down Expand Up @@ -379,7 +380,13 @@ public void testListenerPlugins() throws Exception {
lastEvent.getType());
// verify timestamp
Instant now = Instant.now();
assertTrue("timestamp of the event is in the future", now.isAfter(lastEvent.getTimestamp()));
if (OS.isFamilyWindows()) {
// JDK-8180466 - Windows does not have fine-grained Instant support, so accept equal times
assertFalse(
"timestamp of the event is in the future", now.isBefore(lastEvent.getTimestamp()));
} else {
assertTrue("timestamp of the event is in the future", now.isAfter(lastEvent.getTimestamp()));
}
assertEquals(collection, ((CollectionsAddedEvent) lastEvent).getCollectionNames().next());

dummyEventLatch = new CountDownLatch(1);
Expand All @@ -398,7 +405,13 @@ public void testListenerPlugins() throws Exception {
lastEvent.getType());
// verify timestamp
now = Instant.now();
assertTrue("timestamp of the event is in the future", now.isAfter(lastEvent.getTimestamp()));
if (OS.isFamilyWindows()) {
// JDK-8180466 - Windows does not have fine-grained Instant support, so accept equal times
assertFalse(
"timestamp of the event is in the future", now.isBefore(lastEvent.getTimestamp()));
} else {
assertTrue("timestamp of the event is in the future", now.isAfter(lastEvent.getTimestamp()));
}
assertEquals(collection, ((CollectionsRemovedEvent) lastEvent).getCollectionNames().next());

// test changing the ClusterEventProducer plugin dynamically
Expand Down