diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-02-14 13:25:50 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-02-14 13:25:50 +0100 |
commit | 8af6ce0df1cb97bb80e74febf36fbb222e6a45df (patch) | |
tree | 644dcc5d7444879f8fd5da359720bd67eee32b27 /node-repository/src | |
parent | 9f8f18a653d24f4f15c8672523c50232fc22eaed (diff) |
Fix unstable test
Deserialized instants only have millisecond precision, but `ManualClock` has
nanosecond precision.
Advancing the time by exactly the durations used by `LoadBalancerExpirer`
accidentally works if the `ManualClock` is ahead by a few nanoseconds.
Diffstat (limited to 'node-repository/src')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java index 4b7534b431e..7e8fcddb1ae 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java @@ -75,7 +75,7 @@ public class LoadBalancerExpirerTest { assertTrue("Inactive load balancer not removed", tester.loadBalancerService().instances().containsKey(lb1)); // Expirer removes load balancers once expiration time passes - tester.clock().advance(Duration.ofHours(1)); + tester.clock().advance(Duration.ofHours(1).plus(Duration.ofSeconds(1))); expirer.maintain(); assertFalse("Inactive load balancer removed", tester.loadBalancerService().instances().containsKey(lb1)); @@ -94,7 +94,7 @@ public class LoadBalancerExpirerTest { dirtyNodesOf(app2, cluster2); // Expirer removes load balancer for removed cluster - tester.clock().advance(Duration.ofHours(1)); + tester.clock().advance(Duration.ofHours(1).plus(Duration.ofSeconds(1))); expirer.maintain(); assertFalse("Inactive load balancer removed", tester.loadBalancerService().instances().containsKey(lb3)); } @@ -122,7 +122,7 @@ public class LoadBalancerExpirerTest { // Application never activates and nodes are dirtied. Expirer moves load balancer to inactive after timeout dirtyNodesOf(app, cluster); - tester.clock().advance(Duration.ofHours(1)); + tester.clock().advance(Duration.ofHours(1).plus(Duration.ofSeconds(1))); expirer.maintain(); assertSame(LoadBalancer.State.inactive, loadBalancers.get().get(lb).state()); @@ -131,7 +131,7 @@ public class LoadBalancerExpirerTest { assertSame(LoadBalancer.State.inactive, loadBalancers.get().get(lb).state()); // Expirer removes inactive load balancer - tester.clock().advance(Duration.ofHours(1)); + tester.clock().advance(Duration.ofHours(1).plus(Duration.ofSeconds(1))); expirer.maintain(); assertFalse("Inactive load balancer removed", loadBalancers.get().containsKey(lb)); } |