Skip to content

minor improvement in fabric8 integration tests (2) #1869

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
merged 6 commits into from
Feb 10, 2025
Merged

minor improvement in fabric8 integration tests (2) #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5c307a
cleanup
wind57 Feb 9, 2025
2ba5fbd
fix test
wind57 Feb 9, 2025
f8f0d13
fix test
wind57 Feb 9, 2025
f7f4c28
empty
wind57 Feb 9, 2025
281957e
Merge branch '3.1.x' into cleanup_fabric8_integration_tests
wind57 Feb 9, 2025
1cfa444
simplify test
wind57 Feb 9, 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
9 changes: 0 additions & 9 deletions .../java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import java.time.Duration;

import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -77,14 +76,6 @@ void shouldStart() {
assertThat(leaderInitiator.isRunning()).isTrue();
verify(mockFabric8LeaderRecordWatcher).start();
verify(mockFabric8PodReadinessWatcher).start();
boolean[] updateCalled = new boolean[1];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

simplifies the failing test. We already verify that the method is called, no need to do it twice

Mockito.doAnswer(x -> {
updateCalled[0] = true;
return null;
}).when(mockFabric8LeadershipController).update();

Awaitility.await().atMost(Duration.ofSeconds(3)).until(() -> updateCalled[0]);

verify(mockFabric8LeadershipController, atLeastOnce()).update();
}

Expand Down
12 changes: 0 additions & 12 deletions ...bernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,4 @@
</dependency>

</dependencies>
<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>
12 changes: 0 additions & 12 deletions ...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,5 @@
</dependency>

</dependencies>
<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>

</project>
5 changes: 1 addition & 4 deletions ...g-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,13 @@
</dependency>

</dependencies>

<build>
<resources>
<resource>
<directory>../src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>

Expand Down
Loading