Skip to content

Relax checks for flaky tests in ComputerStateTest #10656

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
timja merged 4 commits into from
May 17, 2025
+19 −10
Merged

Relax checks for flaky tests in ComputerStateTest #10656

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0433082
Relax checks for flaky test in ComputerStateTest
strangelookingnerd May 16, 2025
e452555
Merge branch 'master' into flaky_test
timja May 16, 2025
dfb8a0c
Merge branch 'master' into flaky_test
strangelookingnerd May 16, 2025
08af4fb
Simplify assertion
strangelookingnerd May 17, 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
35 changes: 25 additions & 10 deletions test/src/test/java/hudson/cli/ComputerStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;

import hudson.cli.CLICommandInvoker.Result;
import hudson.model.Computer;
Expand Down Expand Up @@ -94,15 +97,21 @@ public void disconnect() throws Exception {
assertTrue(slave.toComputer().isOnline());

Result result = command.authorizedTo(Jenkins.READ, Computer.DISCONNECT)
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message")
;
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message");

assertThat(result, succeededSilently());
assertTrue(slave.toComputer().isOffline());

OfflineCause.UserCause cause = (OfflineCause.UserCause) slave.toComputer().getOfflineCause();
assertThat(cause.toString(), endsWith("Custom cause message"));
assertThat(cause.getUser(), equalTo(command.user()));
OfflineCause cause = slave.toComputer().getOfflineCause();

if (cause instanceof OfflineCause.UserCause userCause) {
assertThat(userCause.toString(), endsWith("Custom cause message"));
assertThat(userCause.getUser(), equalTo(command.user()));
} else {
// Compensate for test being flaky in CI
assumeThat(cause, not(instanceOf(OfflineCause.ChannelTermination.class)));
fail("OfflineCause should have been UserCause or ChannelTermination, but was " + cause.getClass().getSimpleName() + " instead");
}
}

@Test
Expand All @@ -113,15 +122,21 @@ public void offline() throws Exception {
assertTrue(slave.toComputer().isOnline());

Result result = command.authorizedTo(Jenkins.READ, Computer.DISCONNECT)
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message")
;
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message");

assertThat(result, succeededSilently());
assertTrue(slave.toComputer().isOffline());

OfflineCause.UserCause cause = (OfflineCause.UserCause) slave.toComputer().getOfflineCause();
assertThat(cause.toString(), endsWith("Custom cause message"));
assertThat(cause.getUser(), equalTo(command.user()));
OfflineCause cause = slave.toComputer().getOfflineCause();

if (cause instanceof OfflineCause.UserCause userCause) {
assertThat(userCause.toString(), endsWith("Custom cause message"));
assertThat(userCause.getUser(), equalTo(command.user()));
} else {
// Compensate for test being flaky in CI
assumeThat(cause, not(instanceOf(OfflineCause.ChannelTermination.class)));
fail("OfflineCause should have been UserCause or ChannelTermination, but was " + cause.getClass().getSimpleName() + " instead");
}
}

@Test
Expand Down
Loading