summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-10-21 17:12:07 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-10-21 17:12:07 +0200
commit0848c72d2c06290decc2bf0999063040790f61d6 (patch)
treedc932474d4b7f0bbd6163dc81cbe1d4c9fee6e5c /node-admin
parent38d3fedeb51ff66e86a8bd1ccdfeabbcc11b642d (diff)
Add Orchestrator application lock metrics
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/time/TestTimer.java29
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java2
2 files changed, 1 insertions, 30 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/time/TestTimer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/time/TestTimer.java
deleted file mode 100644
index beadeeed4a3..00000000000
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/time/TestTimer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.node.admin.task.util.time;
-
-import com.yahoo.jdisc.Timer;
-
-import java.time.Duration;
-
-/**
- * @author hakonhall
- */
-public class TestTimer implements Timer {
- private Duration durationSinceEpoch = Duration.ZERO;
-
- public void setMillis(long millisSinceEpoch) {
- durationSinceEpoch = Duration.ofMillis(millisSinceEpoch);
- }
-
- public void advanceMillis(long millis) { advance(Duration.ofMillis(millis)); }
- public void advanceSeconds(long seconds) { advance(Duration.ofSeconds(seconds)); }
- public void advanceMinutes(long minutes) { advance(Duration.ofMinutes(minutes)); }
- public void advance(Duration duration) {
- durationSinceEpoch = durationSinceEpoch.plus(duration);
- }
-
- @Override
- public long currentTimeMillis() {
- return durationSinceEpoch.toMillis();
- }
-}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java
index e66b3a7aed2..09b6e65aca5 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/process/ProcessFactoryImplTest.java
@@ -2,7 +2,7 @@
package com.yahoo.vespa.hosted.node.admin.task.util.process;
import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixPath;
-import com.yahoo.vespa.hosted.node.admin.task.util.time.TestTimer;
+import com.yahoo.jdisc.test.TestTimer;
import org.junit.Test;
import org.mockito.ArgumentCaptor;