Skip to content
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

Jump to bottom

Random management.server.port should not set to the same value as local.server.port #16108

Closed
wants to merge 1 commit into from
Closed

Random management.server.port should not set to the same value as local.server.port #16108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...a/org/springframework/boot/test/web/SpringBootTestRandomPortEnvironmentPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
}
Integer managementPort = getPropertyAsInteger(environment,
MANAGEMENT_PORT_PROPERTY, null);
if (managementPort == null || managementPort.equals(-1)) {
if (managementPort == null || managementPort.equals(-1)
|| managementPort.equals(0)) {
return;
}
Integer serverPort = getPropertyAsInteger(environment, SERVER_PORT_PROPERTY,
Expand Down
13 changes: 12 additions & 1 deletion .../springframework/boot/test/web/SpringBootTestRandomPortEnvironmentPostProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -58,6 +58,17 @@ public void postProcessWhenServerAndManagementPortIsZeroInTestPropertySource() {
assertThat(this.environment.getProperty("management.server.port")).isEqualTo("0");
}

@Test
public void postProcessWhenServerPortAndManagementPortIsZeroInDifferentPropertySources() {
addTestPropertySource("0", null);
Map<String, Object> source = new HashMap<>();
source.put("management.server.port", "0");
this.propertySources.addLast(new MapPropertySource("other", source));
this.postProcessor.postProcessEnvironment(this.environment, null);
assertThat(this.environment.getProperty("server.port")).isEqualTo("0");
assertThat(this.environment.getProperty("management.server.port")).isEqualTo("0");
}

@Test
public void postProcessWhenTestServerAndTestManagementPortAreNonZero() {
addTestPropertySource("8080", "8081");
Expand Down