Revert "Add Orchestrator application lock metrics"

2 files changed, 30 insertions, 1 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
new file mode 100644
index 00000000000..beadeeed4a3
--- /dev/null
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/time/TestTimer.java
@@ -0,0 +1,29 @@
+// 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 09b6e65aca5..e66b3a7aed2 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.jdisc.test.TestTimer;
+import com.yahoo.vespa.hosted.node.admin.task.util.time.TestTimer;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;