diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2019-01-14 15:40:53 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-14 15:40:53 +0100 |
| commit | eeeff8ac4f7dcd58aaa5f7301d79bbc09f10c680 (patch) | |
| tree | b1dec9d6f6ea6435b66be3ad3981f5b99d1610bd /node-admin | |
| parent | 60b1ce20e9c1c44c92e178a79f8c58e0fccdab7f (diff) | |
Allow different drop caches strategies
Diffstat (limited to 'node-admin')
2 files changed, 2 insertions, 4 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java index 7ac74b190ad..88cc833f1f8 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java @@ -6,7 +6,6 @@ import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.NodeType; import com.yahoo.metrics.simple.MetricReceiver; import com.yahoo.system.ProcessExecuter; -import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.hosted.dockerapi.Docker; import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper; @@ -60,7 +59,7 @@ public class DockerTester implements AutoCloseable { final Orchestrator orchestrator = mock(Orchestrator.class); final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class); final InOrder inOrder = Mockito.inOrder(docker, nodeRepository, orchestrator, storageMaintainer); - final InMemoryFlagSource flagSource = new InMemoryFlagSource().withFlag(Flags.CONTAINER_CPU_CAP.id()); + final InMemoryFlagSource flagSource = new InMemoryFlagSource(); final NodeAdminStateUpdater nodeAdminStateUpdater; final NodeAdminImpl nodeAdmin; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index 1b116b304b2..d9255daf00b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -82,8 +82,7 @@ public class NodeAgentImplTest { private final ContainerStats emptyContainerStats = new ContainerStats(Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap()); private final AthenzCredentialsMaintainer athenzCredentialsMaintainer = mock(AthenzCredentialsMaintainer.class); - private final InMemoryFlagSource flagSource = new InMemoryFlagSource() - .withFlag(Flags.CONTAINER_CPU_CAP.id()); + private final InMemoryFlagSource flagSource = new InMemoryFlagSource(); @Test |