1 files changed, 5 insertions, 1 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
index af87c008260..bb293a76d09 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
@@ -5,6 +5,7 @@ import com.yahoo.test.ManualClock;
 import org.junit.Test;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,7 +15,7 @@ public class NodeMetricsDbTest {
 
     @Test
     public void testNodeMetricsDb() {
-        ManualClock clock = new ManualClock();
+        ManualClock clock = new ManualClock(Instant.ofEpochSecond(1596102538L));
         NodeMetricsDb db = new NodeMetricsDb();
         List<NodeMetrics.MetricValue> values = new ArrayList<>();
         for (int i = 0; i < 40; i++) {
@@ -23,6 +24,9 @@ public class NodeMetricsDbTest {
         }
         db.add(values);
 
+        // Avoid off-by-one bug when the below windows starts exactly on one of the above getEpochSecond() timestamps.
+        clock.advance(Duration.ofMinutes(1));
+
         assertEquals(29, db.getWindow(clock.instant().minus(Duration.ofHours(30)), Resource.cpu,    List.of("host0")).measurementCount());
         assertEquals( 0, db.getWindow(clock.instant().minus(Duration.ofHours(30)), Resource.memory, List.of("host0")).measurementCount());
         db.gc(clock);