Increased versioncolumn coverage #278
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
github-actions
bot
added
dependencies
MarkEWaite
approved these changes
Nov 17, 2024
MarkEWaite
reviewed
Nov 17, 2024
|
Thanks. This looks great. For future pull requests, please use a branch named something other than "master" so that I can use standard "gh" and "git" commands to interact with your pull request. |
MarkEWaite
removed
dependencies
basil
reviewed
Jan 17, 2025
Comment on lines
+92
to
+131
| @Test | ||
| public void testMonitor_DifferentVersion_NotIgnored() throws IOException, InterruptedException { | ||
| VersionMonitor.DescriptorImpl descriptor = spy(new VersionMonitor.DescriptorImpl()); | ||
| doReturn(false).when(descriptor).isIgnored(); // Ensure isIgnored returns false | ||
|
|
||
| Computer computer = mock(Computer.class); | ||
| VirtualChannel channel = mock(VirtualChannel.class); | ||
| String differentVersion = "different-version"; | ||
|
|
||
| when(computer.getChannel()).thenReturn(channel); | ||
| when(channel.call(ArgumentMatchers.<MasterToSlaveCallable<String, IOException>>any())) | ||
| .thenReturn(differentVersion); | ||
| when(computer.isOffline()).thenReturn(false); | ||
| when(computer.getName()).thenReturn("TestComputer"); | ||
|
|
||
| String result = descriptor.monitor(computer); | ||
|
|
||
| assertEquals(differentVersion, result); | ||
| verify(computer).setTemporarilyOffline(eq(true), any(VersionMonitor.RemotingVersionMismatchCause.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMonitor_DifferentVersion_Ignored() throws IOException, InterruptedException { | ||
| VersionMonitor.DescriptorImpl descriptor = spy(new VersionMonitor.DescriptorImpl()); | ||
| doReturn(true).when(descriptor).isIgnored(); // Ensure isIgnored returns true | ||
|
|
||
| Computer computer = mock(Computer.class); | ||
| VirtualChannel channel = mock(VirtualChannel.class); | ||
| String differentVersion = "different-version"; | ||
|
|
||
| when(computer.getChannel()).thenReturn(channel); | ||
| when(channel.call(ArgumentMatchers.<MasterToSlaveCallable<String, IOException>>any())) | ||
| .thenReturn(differentVersion); | ||
| when(computer.isOffline()).thenReturn(false); | ||
|
|
||
| String result = descriptor.monitor(computer); | ||
|
|
||
| assertEquals(differentVersion, result); | ||
| verify(computer, never()).setTemporarilyOffline(anyBoolean(), any()); | ||
| } |
There was a problem hiding this comment.
These newly-added tests are failing on recent cores as of jenkinsci/jenkins#9855. A hazard of using Mockito.
This was referenced Jan 17, 2025
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.
Testing done
Submitter checklist