Skip to content

Commit 66f2889

Browse files
committed
Bug 36476293 - Build: harden GlobalSocketProviderTests to avoid port conflicts
(merge main -> ce/main 108223) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 108225]
1 parent d464425 commit 66f2889

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

prj/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,9 @@
439439
<property>
440440
<!--
441441
Automatically enabled when inside IntelliJ.
442-
IntelliJ sets the idea.version property when importing Maven projects.
442+
IntelliJ sets the idea.maven.embedder.version property when importing Maven projects.
443443
-->
444-
<name>idea.version</name>
444+
<name>idea.maven.embedder.version</name>
445445
</property>
446446
</activation>
447447

prj/test/functional/ssl/src/main/java/ssl/GlobalSocketProviderTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import java.util.concurrent.TimeUnit;
8080
import java.util.concurrent.atomic.AtomicInteger;
8181

82+
import static com.tangosol.internal.net.metrics.MetricsHttpHelper.PROP_METRICS_ENABLED;
8283
import static org.hamcrest.CoreMatchers.is;
8384
import static org.hamcrest.MatcherAssert.assertThat;
8485
import static org.hamcrest.CoreMatchers.containsString;
@@ -101,7 +102,7 @@ public static void setup()
101102
System.setProperty("coherence.localhost", "127.0.0.1");
102103
System.setProperty("coherence.wka", "127.0.0.1");
103104
System.setProperty("coherence.role", "client");
104-
System.setProperty(MetricsHttpHelper.PROP_METRICS_ENABLED, "true");
105+
System.setProperty(MetricsHttpHelper.PROP_METRICS_ENABLED, "false");
105106

106107
m_ports = LocalPlatform.get().getAvailablePorts();
107108
}
@@ -235,6 +236,7 @@ public void shouldUseGlobalSocketProviderWithExtendProxy() throws Exception
235236
assertThat(member.invoke(new IsSecureProxy()), is(true));
236237
}
237238

239+
System.setProperty(PROP_METRICS_ENABLED, "false");
238240
System.setProperty("coherence.extend.address", "127.0.0.1");
239241
System.setProperty("coherence.extend.port", String.valueOf(extendPort.get()));
240242

0 commit comments

Comments
 (0)