summaryrefslogtreecommitdiffstats
path: root/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java')
-rw-r--r--vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java19
1 files changed, 2 insertions, 17 deletions
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
index 4b726eb6637..e881d4b3ff6 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
@@ -44,7 +44,7 @@ public class MaintainerTest {
public void success_metric() {
AtomicLong consecutiveFailures = new AtomicLong();
JobMetrics jobMetrics = new JobMetrics((job, count) -> consecutiveFailures.set(count));
- TestMaintainer maintainer = new TestMaintainer(null, Maintainer.Mode.shared, jobControl, jobMetrics);
+ TestMaintainer maintainer = new TestMaintainer(null, jobControl, jobMetrics);
// Maintainer fails twice in a row
maintainer.successOnNextRun(false).run();
@@ -68,24 +68,9 @@ public class MaintainerTest {
maintainer.throwOnNextRun(null).run();
assertEquals(0, consecutiveFailures.get());
- // Lock exception is considered successful for shared maintainer
- maintainer.throwOnNextRun(new UncheckedTimeoutException()).run();
- assertEquals(0, consecutiveFailures.get());
- }
-
- @Test
- public void success_metric_exclusive_maintainer() {
- AtomicLong consecutiveFailures = new AtomicLong();
- JobMetrics jobMetrics = new JobMetrics((job, count) -> consecutiveFailures.set(count));
- TestMaintainer maintainer = new TestMaintainer(null, Maintainer.Mode.exclusive, jobControl, jobMetrics);
-
- // Timeout is considered a failure
+ // Lock exception is treated as a failure
maintainer.throwOnNextRun(new UncheckedTimeoutException()).run();
assertEquals(1, consecutiveFailures.get());
-
- // Maintainer recovers
- maintainer.throwOnNextRun(null).run();
- assertEquals(0, consecutiveFailures.get());
}
}