summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-02-08 09:16:01 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-02-08 09:16:01 +0100
commit324fc8346330735d8a2a299acb46a2886eb9576e (patch)
tree94400f7f8515602d04ec2bb98fca7782f500e687 /node-repository
parentf6ae7e7aaf88e1810267e617f6d99a91306f970a (diff)
Code review fixes
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java1
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
index 1d1fd3d1b99..38352e033dd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
@@ -126,7 +126,6 @@ public class DynamicDockerProvisionTest {
doAnswer(invocation -> {
int numHosts = (int) invocation.getArguments()[0];
Flavor nodeFlavor = (Flavor) invocation.getArguments()[1];
- System.out.println(numHosts + " " + nodeFlavor);
return IntStream.range(0, numHosts)
.map(i -> ++numProvisioned[0])
.mapToObj(i -> new ProvisionedHost("id-" + i, "host-" + i, hostFlavor, "host-" + i + "-1", nodeFlavor))
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index eeebe4de256..fd2534f54b8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -452,7 +452,7 @@ public class ProvisioningTester {
Optional.ofNullable(zone).orElseGet(Zone::defaultZone),
Optional.ofNullable(nameResolver).orElseGet(() -> new MockNameResolver().mockAnyLookup()),
orchestrator,
- Optional.ofNullable(hostProvisioner).orElse(null),
+ hostProvisioner,
Optional.ofNullable(loadBalancerService).orElseGet(LoadBalancerServiceMock::new),
Optional.ofNullable(flagSource).orElseGet(InMemoryFlagSource::new));
}