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

Drop more overlaping tests last fabric8 #1847

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Drop more overlaping tests last fabric8 #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10f079f
fix
wind57 Jan 20, 2025
6ce1c51
Merge branch '3.1.x' into drop_more_overlaping_tests_last_fabric8
wind57 Jan 20, 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
2 changes: 1 addition & 1 deletion ...EnabledPollingReloadConfigMapMountIT.java → ...onfigMapMountMountPollingBootstrapIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
/**
* @author wind57
*/
class BootstrapEnabledPollingReloadConfigMapMountIT {
class Fabric8ConfigMapMountMountPollingBootstrapIT {

private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";

Expand Down
2 changes: 1 addition & 1 deletion ...onfigMapMountPollingReloadDelegateIT.java → ...Fabric8ConfigMapMountPollingReloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
/**
* @author wind57
*/
class ConfigMapMountPollingReloadDelegateIT {
class Fabric8ConfigMapMountPollingReloadIT {

private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";

Expand Down
24 changes: 22 additions & 2 deletions ...nt/reload/Fabric8EventReloadInformIT.java → ...bric8EventReloadConfigMapBootstrapIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
"spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles("two")
class Fabric8EventReloadInformIT extends Fabric8EventReloadBase {
class Fabric8EventReloadConfigMapBootstrapIT extends Fabric8EventReloadBase {

private static final String LEFT_NAMESPACE = "left";

Expand Down Expand Up @@ -109,7 +109,27 @@ void test(CapturedOutput output) {
assertThat(leftProperties.getValue()).isEqualTo("left-initial");
assertThat(rightProperties.getValue()).isEqualTo("right-initial");

// then deploy a new version of right-configmap
// then deploy a new version of right-configmap, but without changing its data,
// only add a label, thus no refresh happens
ConfigMap configMap = new ConfigMapBuilder()
.withMetadata(new ObjectMetaBuilder().withLabels(Map.of("new-label", "abc"))
.withNamespace(RIGHT_NAMESPACE)
.withName("right-configmap")
.build())
.withData(Map.of("right.value", "right-initial"))
.build();

replaceConfigMap(kubernetesClient, configMap, RIGHT_NAMESPACE);

await().atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(1))
.until(() -> output.getOut().contains("ConfigMap right-configmap was updated in namespace right"));

await().atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(1))
.until(() -> output.getOut().contains("data in configmap has not changed, will not reload"));

// then deploy a new version of right-configmap, that actually changes some data
ConfigMap rightConfigMapAfterChange = new ConfigMapBuilder()
.withMetadata(new ObjectMetaBuilder().withNamespace(RIGHT_NAMESPACE).withName("right-configmap").build())
.withData(Map.of("right.value", "right-after-change"))
Expand Down
136 changes: 0 additions & 136 deletions ...rk/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadDataChangesInConfigMapIT.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...nt/reload/Fabric8EventReloadSecretIT.java → ...Fabric8EventReloadSecretConfigDataIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
"spring.cloud.kubernetes.client.namespace=default" })
@ActiveProfiles("with-secret")
class Fabric8EventReloadSecretIT extends Fabric8EventReloadBase {
class Fabric8EventReloadSecretConfigDataIT extends Fabric8EventReloadBase {

private static final String NAMESPACE = "default";

Expand Down
Loading