Add handling of bucket spaces stats to HostInfo and ClusterStatsAggregator.

Handling of outstanding merge ops has been removed as this information has never been provided by the distributors.

1 files changed, 1 insertions, 4 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java
index 0af7bcbfeaf..d27acf8bc17 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java
@@ -11,14 +11,11 @@ import org.junit.Test;
 import java.util.Arrays;
 import java.util.Optional;
 
-import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
 
 public class StateVersionTrackerTest {
 
@@ -28,7 +25,7 @@ public class StateVersionTrackerTest {
     }
 
     private static StateVersionTracker createWithMockedMetrics() {
-        return new StateVersionTracker(mock(MetricUpdater.class));
+        return new StateVersionTracker();
     }
 
     private static void updateAndPromote(final StateVersionTracker versionTracker,