Remove container watchdog

- Remove ActiveContainerDeactivationWatchdog
- Move deconstruction enforcer to ActiveContainer

1 files changed, 2 insertions, 5 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
index 66d0686244d..d94cea033f5 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java
@@ -1,8 +1,7 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.jdisc.metric;
 
 import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.statistics.ActiveContainerMetrics;
 import org.junit.Test;
 
 import java.time.Duration;
@@ -21,9 +20,7 @@ public class MetricUpdaterTest {
     @Test
     public void metrics_are_updated_in_scheduler_cycle() throws InterruptedException {
         Metric metric = mock(Metric.class);
-        ActiveContainerMetrics activeContainerMetrics = mock(ActiveContainerMetrics.class);
-        new MetricUpdater(new MockScheduler(), metric, activeContainerMetrics);
-        verify(activeContainerMetrics, times(1)).emitMetrics(any());
+        new MetricUpdater(new MockScheduler(), metric);
         verify(metric, times(8)).set(anyString(), any(), any());
     }