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

Remove test-only agent protocol definitions #7451

Merged
merged 1 commit into from
Nov 26, 2022
Merged

Remove test-only agent protocol definitions #7451

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/src/test/java/jenkins/AgentProtocolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public class AgentProtocolTest {
@LocalData
@Issue("JENKINS-45841")
public void testShouldNotOverrideUserConfiguration() throws Exception {
assertEnabled("JNLP-connect");
assertDisabled("JNLP2-connect", "JNLP4-connect");
assertEnabled("JNLP4-connect");
assertDisabled("JNLP2-connect", "JNLP3-connect");
assertProtocols(true, "System protocols should be always enabled", "Ping");
}

Expand Down
59 changes: 0 additions & 59 deletions test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol.java
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol2.java
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions test/src/test/java/jenkins/TestJnlpSlaveAgentProtocol3.java
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions test/src/test/resources/jenkins/AgentProtocolTest/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,12 @@
</views>
<primaryView>all</primaryView>
<slaveAgentPort>0</slaveAgentPort>
<!-- YOLO: unstable configuration -->
<enabledAgentProtocols>
<!-- Since removed, but may as well test robustness of load: -->
<string>CLI-connect</string>
<string>JNLP-connect</string>
<string>JNLP3-connect</string>
<string>JNLP4-connect</string>
</enabledAgentProtocols>
<disabledAgentProtocols>
<string>JNLP4-connect</string>
<string>JNLP2-connect</string>
<!-- Ditto: -->
<string>CLI2-connect</string>
<string>JNLP3-connect</string>
</disabledAgentProtocols>
<label></label>
<nodeProperties/>
Expand Down