Skip to content

S
spring-boot-admin
Commit ac7a3a20 by Johannes Edmeier
Options

Fix flaky test (hopefully)

parent 09ac0fee
Showing with 56 additions and 96 deletions
spring-boot-admin-server-ui/package-lock.json
......@@ -141,9 +141,9 @@
}
},
"@fortawesome/fontawesome": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.4.tgz",
"integrity": "sha512-KgmesNO47kpIRBWgy9Tkw62T5stz1PDKn2QNFCuwEuk05zl+NHgy90oZQuww2dXZ24hTOS9YRAx0klE8UBLsxg==",
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.5.tgz",
"integrity": "sha512-WAgbcVs7/YTxq7RK/dhyoJPzaIZpOQnStyO5s1sj0rZa0J1ScXYoGPmsP1ec6qM/BhDjRVB228xr2DiCPTHRCA==",
"requires": {
"@fortawesome/fontawesome-common-types": "0.1.3"
}
......@@ -154,25 +154,25 @@
"integrity": "sha512-jJXUoNkmHozqlcXzNiYytcmEe3eNxn7Vh8hmnIoRi0TmT3ChQ0osuSApuIObIomnIcvqlA24FCpnamKvfZ7F5g=="
},
"@fortawesome/fontawesome-free-brands": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.8.tgz",
"integrity": "sha512-r7qD8ZZt4ke0w1ZBHuINNIVHlSQpZOxhToF8CA2PK1TQsg2l/PsM2reTlzkNg/t1EldU4ivXW/qt6Y/uHEMMhw==",
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.9.tgz",
"integrity": "sha512-99i0Hdntya/A5OqPFzT1p2iY+hBTdHNGH3xTNLHoN0lzfp9sIDgRpm/N+NY7+2xeK1HSW5O7/HpWJ88BB+kUdQ==",
"requires": {
"@fortawesome/fontawesome-common-types": "0.1.3"
}
},
"@fortawesome/fontawesome-free-regular": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.8.tgz",
"integrity": "sha512-FsLlHx6tKr6sE6Vy8rUEOJI39/UeLebsMGfcsLfvTfq//Y4hjRFJuK1LWpunmOTfT8oxUNvp9fuDPlxO42MEfg==",
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.9.tgz",
"integrity": "sha512-ZmFzheHYShlP8/rp0tSojhVN5ZcuaOIN9kZkCEevFU3AIgVkCju8LuLeZXTFq/qkS74NAZipwNys8nlQbIsX2g==",
"requires": {
"@fortawesome/fontawesome-common-types": "0.1.3"
}
},
"@fortawesome/fontawesome-free-solid": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.8.tgz",
"integrity": "sha512-c7cO2YkX+q1jprm/jMq7hzwl46uaeu1T+UF6ecOnvKIvpZbhmA3swomTDgXUXwVTnY17B9hc7XgXLKjzADFxOw==",
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.9.tgz",
"integrity": "sha512-aCU6iuQErGEgN6EuEA8LXybJWdKmNMXC3MplMsTBfMopfI3BK2Pn2dGxu6/nY67eVAjIvxQs4CulzeJbMHmqXA==",
"requires": {
"@fortawesome/fontawesome-common-types": "0.1.3"
}
......@@ -195,9 +195,9 @@
"dev": true
},
"@vue/test-utils": {
"version": "1.0.0-beta.12",
"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.12.tgz",
"integrity": "sha512-457S/w+VuHnh4jw03ingrVAx8jMbxRz+jGGjoTeEFPZzv20GDzPUauQQqDy71EYw6BiNscC0RGOaLvAcS6BZ9Q==",
"version": "1.0.0-beta.13",
"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.13.tgz",
"integrity": "sha512-HVhh4n8i661BJpVKp2SFUWT9J4kSFFSXF/ZvtlEI2ndEKjNx+1BUGB5V3t3ls1OIDQEFOVoJEuwz3xP/PsCnPQ==",
"dev": true,
"requires": {
"lodash": "4.17.5"
......@@ -2694,9 +2694,9 @@
"dev": true
},
"css-hot-loader": {
"version": "1.3.8",
"resolved": "https://registry.npmjs.org/css-hot-loader/-/css-hot-loader-1.3.8.tgz",
"integrity": "sha512-bJ+FyuWlpjoKo0by6srYGMawRosSfNIZZJ7MHXlu6yfZGQz8dxH159cYzUkaaADhvKSwwBq/lLYy1SguQRT1FQ==",
"version": "1.3.9",
"resolved": "https://registry.npmjs.org/css-hot-loader/-/css-hot-loader-1.3.9.tgz",
"integrity": "sha512-W3RoM3mqIhZyMr2sYJr7Q49gQa6C+W6IjXOcGg/bOcm5Fsbn4ElbMqSVwcCbZZhrSBfL5ZGGA6skJQVrXpbRnQ==",
"dev": true,
"requires": {
"loader-utils": "1.1.0",
......@@ -7772,19 +7772,19 @@
}
},
"node-cache": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz",
"integrity": "sha1-CFJGRe5AOd7cPcwd18a5eeBhnkQ=",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz",
"integrity": "sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==",
"dev": true,
"requires": {
"clone": "2.1.1",
"clone": "2.1.2",
"lodash": "4.17.5"
},
"dependencies": {
"clone": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
"integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
"dev": true
}
}
......@@ -11473,9 +11473,9 @@
}
},
"rxjs": {
"version": "5.5.7",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.7.tgz",
"integrity": "sha512-Hxo2ac8gRQjwjtKgukMIwBRbq5+KAeEV5hXM4obYBOAghev41bDQWgFH4svYiU9UnQ5kNww2LgfyBdevCd2HXA==",
"version": "5.5.8",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz",
"integrity": "sha512-Bz7qou7VAIoGiglJZbzbXa4vpX5BmTTN2Dj/se6+SwADtw4SihqBIiEa7VmTXJ8pynvq0iFr5Gx9VLyye1rIxQ==",
"requires": {
"symbol-observable": "1.0.1"
}
......@@ -13630,9 +13630,9 @@
"dev": true
},
"vue-jest": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-2.2.1.tgz",
"integrity": "sha512-XnJWRFdCkHf+dLaaC0PzIiyQW4hoH7EzqPpPT4/nAmUjx288tsDWL68dbzafcM6c0W9qOPsb2YlFVxDiEd45Zg==",
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-2.3.0.tgz",
"integrity": "sha512-c/ZxWSBA30AXfheSCe9YoFXsVQQh3mv99+GOTuG3hQf1CDuFU9y936EeNs/xM/bgaUvhyfzAb2TVMlmYGG3P3Q==",
"dev": true,
"requires": {
"babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
......@@ -13640,7 +13640,7 @@
"extract-from-css": "0.4.4",
"find-babel-config": "1.1.0",
"js-beautify": "1.7.5",
"node-cache": "4.1.1",
"node-cache": "4.2.0",
"object-assign": "4.1.1",
"source-map": "0.5.7",
"tsconfig": "7.0.0",
......@@ -13656,9 +13656,9 @@
}
},
"vue-loader": {
"version": "14.2.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-14.2.1.tgz",
"integrity": "sha512-QSsDSWzKYxyC2LHpp9+2oteUg/ObHeP1VkZAiFTtkTR3lBV7mobcfxzHdQl9mBeJEjdCZpjzWiIUCAErE0K1EA==",
"version": "14.2.2",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-14.2.2.tgz",
"integrity": "sha512-SehrPGsxSssZXQoR7DTAm2oMBiJxV+xTIX5BUxc+qFsNo0iIj01tzAMXWt0PD5hjoNCXdS5Bq1KLRy7WaMdkKg==",
"dev": true,
"requires": {
"consolidate": "0.14.5",
......@@ -13669,17 +13669,17 @@
"postcss-load-config": "1.2.0",
"postcss-selector-parser": "2.2.3",
"prettier": "1.11.1",
"resolve": "1.5.0",
"resolve": "1.6.0",
"source-map": "0.6.1",
"vue-hot-reload-api": "2.3.0",
"vue-style-loader": "4.0.2",
"vue-style-loader": "4.1.0",
"vue-template-es2015-compiler": "1.6.0"
},
"dependencies": {
"resolve": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz",
"integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
"dev": true,
"requires": {
"path-parse": "1.0.5"
......@@ -13693,9 +13693,9 @@
"integrity": "sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w=="
},
"vue-style-loader": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.0.2.tgz",
"integrity": "sha512-Bwf1Gf331Z5OTzMRAYQYiFpFbaCpaXQjQcSvWYsmEwSgOIVa+moXWoD8fQCNetcekbP3OSE5pyvomNKbvIUQtQ==",
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.0.tgz",
"integrity": "sha512-IsSiXDrLW2QIjyBsCqa35e45l5AceMbJ2jO8DxoEQv75xu/UmtXkSC0ybESq/LpbmmIW47MAWDQvErUw+Hrz/A==",
"dev": true,
"requires": {
"hash-sum": "1.0.2",
......
spring-boot-admin-server-ui/package.json
......@@ -9,10 +9,10 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@fortawesome/fontawesome": "^1.1.4",
"@fortawesome/fontawesome-free-brands": "^5.0.8",
"@fortawesome/fontawesome-free-regular": "^5.0.8",
"@fortawesome/fontawesome-free-solid": "^5.0.8",
"@fortawesome/fontawesome": "^1.1.5",
"@fortawesome/fontawesome-free-brands": "^5.0.9",
"@fortawesome/fontawesome-free-regular": "^5.0.9",
"@fortawesome/fontawesome-free-solid": "^5.0.9",
"@fortawesome/vue-fontawesome": "0.0.22",
"axios": "^0.18.0",
"bulma": "^0.6.2",
......@@ -31,14 +31,14 @@
"moment-shortformat": "^2.1.0",
"pretty-bytes": "^4.0.2",
"resize-observer-polyfill": "^1.5.0",
"rxjs": "^5.5.7",
"rxjs": "^5.5.8",
"vue": "^2.5.16",
"vue-clickaway": "^2.1.0",
"vue-router": "^3.0.1",
"yamljs": "^0.3.0"
},
"devDependencies": {
"@vue/test-utils": "^1.0.0-beta.12",
"@vue/test-utils": "^1.0.0-beta.13",
"autoprefixer": "^8.2.0",
"babel-core": "^6.25.0",
"babel-eslint": "^8.2.2",
......@@ -50,7 +50,7 @@
"babel-preset-stage-2": "^6.24.1",
"clean-webpack-plugin": "^0.1.19",
"cross-env": "^5.1.4",
"css-hot-loader": "^1.3.8",
"css-hot-loader": "^1.3.9",
"css-loader": "^0.28.11",
"css-mqpacker": "^6.0.2",
"eslint": "^4.19.1",
......@@ -71,8 +71,8 @@
"sass-loader": "^6.0.7",
"style-loader": "^0.20.3",
"url-loader": "^0.6.2",
"vue-jest": "^2.2.1",
"vue-loader": "^14.2.1",
"vue-jest": "^2.3.0",
"vue-loader": "^14.2.2",
"vue-svg-loader": "^0.5.0",
"vue-template-compiler": "^2.5.16",
"webpack": "^3.11.0",
......
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/config/AdminServerNotifierAutoConfigurationTest.java
......@@ -16,11 +16,6 @@
package de.codecentric.boot.admin.server.config;
import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
import de.codecentric.boot.admin.server.domain.events.InstanceStatusChangedEvent;
import de.codecentric.boot.admin.server.domain.values.InstanceId;
import de.codecentric.boot.admin.server.domain.values.StatusInfo;
import de.codecentric.boot.admin.server.eventstore.InstanceEventStore;
import de.codecentric.boot.admin.server.notify.CompositeNotifier;
import de.codecentric.boot.admin.server.notify.HipchatNotifier;
import de.codecentric.boot.admin.server.notify.LetsChatNotifier;
......@@ -32,13 +27,8 @@ import de.codecentric.boot.admin.server.notify.OpsGenieNotifier;
import de.codecentric.boot.admin.server.notify.PagerdutyNotifier;
import de.codecentric.boot.admin.server.notify.SlackNotifier;
import de.codecentric.boot.admin.server.notify.TelegramNotifier;
import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink;
import reactor.core.publisher.Mono;
import reactor.core.publisher.UnicastProcessor;
import reactor.test.StepVerifier;
import de.codecentric.boot.admin.server.notify.TestNotifier;
import java.util.Collections;
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Qualifier;
......@@ -52,9 +42,6 @@ import org.springframework.mail.javamail.JavaMailSenderImpl;
import static org.assertj.core.api.Assertions.assertThat;
public class AdminServerNotifierAutoConfigurationTest {
private static final InstanceEvent APP_DOWN = new InstanceStatusChangedEvent(InstanceId.of("id-2"), 0L,
StatusInfo.ofDown());
private AnnotationConfigApplicationContext context;
@After
......@@ -67,14 +54,8 @@ public class AdminServerNotifierAutoConfigurationTest {
@Test
public void test_notifierListener() {
load(TestSingleNotifierConfig.class);
InstanceEventStore store = context.getBean(InstanceEventStore.class);
StepVerifier.create(context.getBean(TestNotifier.class).getFlux())
.expectSubscription()
.then(() -> StepVerifier.create(store.append(Collections.singletonList(APP_DOWN))).verifyComplete())
.expectNext(APP_DOWN)
.thenCancel()
.verify();
assertThat(context.getBean(Notifier.class)).isInstanceOf(TestNotifier.class);
assertThat(context.getBeansOfType(Notifier.class)).hasSize(1);
}
@Test
......@@ -202,25 +183,4 @@ public class AdminServerNotifierAutoConfigurationTest {
return new TestNotifier();
}
}
private static class TestNotifier implements Notifier {
private final Flux<InstanceEvent> publishedFlux;
private final FluxSink<InstanceEvent> sink;
private TestNotifier() {
UnicastProcessor<InstanceEvent> unicastProcessor = UnicastProcessor.create();
this.publishedFlux = unicastProcessor;
this.sink = unicastProcessor.sink();
}
@Override
public Mono<Void> notify(InstanceEvent event) {
this.sink.next(event);
return Mono.empty();
}
public Flux<InstanceEvent> getFlux() {
return publishedFlux;
}
}
}
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/notify/RemindingNotifierTest.java
......@@ -146,7 +146,7 @@ public class RemindingNotifierTest {
.expectNext(appDown)
.expectNext(appDown)
.then(reminder::stop)
.expectNoEvent(Duration.ofMillis(10))
.expectNoEvent(Duration.ofMillis(100))
.thenCancel()
.verify();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment