Test regressions after JTH bump #9762
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
commented
Sep 19, 2024
| @@ -104,7 +104,7 @@ public void run(JenkinsRule r) throws Throwable { | |||
| p.setAssignedNode(agent); | |||
| FreeStyleBuild b = r.buildAndAssertSuccess(p); | |||
| if (webSocket) { | |||
| assertThat(agent.toComputer().getSystemProperties().get("java.class.path"), is(new File(r.jenkins.root, "agent.jar").getAbsolutePath())); | |||
| assertThat(agent.toComputer().getSystemProperties().get("java.class.path").toString(), endsWith("agent.jar")); | |||
jglick
commented
Sep 19, 2024
| @Test | ||
| public void runWithCurrentAgentJar() throws Throwable { | ||
| runWithRemoting(null, null, false); | ||
| } | ||
|
|
||
| private void runWithRemoting(String expectedRemotingVersion, String remotingResourcePath, boolean requestingJarFromAgent) throws Throwable { | ||
| if (expectedRemotingVersion != null) { | ||
| FileUtils.copyURLToFile(Security3430Test.class.getResource(remotingResourcePath), new File(jj.getHome(), "agent.jar")); | ||
| // TODO brittle; rather call InboundAgentRule.start(AgentArguments, Options) with a known agentJar | ||
| FileUtils.copyURLToFile(Security3430Test.class.getResource(remotingResourcePath), new File(System.getProperty("java.io.tmpdir"), "agent.jar")); |
There was a problem hiding this comment.
Introduced in 5d26b53. jenkinsci/jenkins-test-harness#838 picks a different location.
There was a problem hiding this comment.
jenkinsci/jenkins-test-harness#843 fixes location reuse that likely caused the failure being @Ignored here.
jglick
commented
Sep 19, 2024
| @@ -126,7 +129,7 @@ private static void _run(JenkinsRule j, String agentName, String expectedRemotin | |||
| if (requestingJarFromAgent) { | |||
| assertThat(logRecords, hasItem(logMessageContainsString("Allowing URL: file:/"))); | |||
| } else { | |||
| assertThat(logRecords, is(empty())); | |||
| assertThat(logRecords.stream().map(LogRecord::getMessage).toList(), is(empty())); | |||
There was a problem hiding this comment.
Previous failure message was unhelpful (LogRecord does not override toString).
jglick
commented
Sep 19, 2024
Vlatombe
approved these changes
Sep 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supersedes #9759. Downstream of jenkinsci/jenkins-test-harness#842.