diff options
| author | toby <smorgrav@yahoo-inc.com> | 2017-09-06 14:01:22 -0700 |
|---|---|---|
| committer | toby <smorgrav@yahoo-inc.com> | 2017-09-06 16:20:48 -0700 |
| commit | 76bd9668a46bd13f75e49e8d730c5a44874a8599 (patch) | |
| tree | 05c4bf10ccdc623d8db50205863d0c5ca7ac7811 /node-repository | |
| parent | 4523019666b2a445394fe7887805af8ce1a603e5 (diff) | |
Revert some of the test thing
Diffstat (limited to 'node-repository')
3 files changed, 6 insertions, 18 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java index e32196d1e52..c5d60c30356 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java @@ -54,12 +54,11 @@ class GroupPreparer { // Create a prioritized set of nodes NodePrioritizer prioritizer = new NodePrioritizer(nodeRepository.getNodes(), - application, - cluster, - requestedNodes, - nodeRepository.getAvailableFlavors(), - nofSpares, - nodeRepository.nameResolver()); + application, + cluster, + requestedNodes, + nodeRepository.getAvailableFlavors(), + nofSpares); prioritizer.addApplicationNodes(); prioritizer.addSurplusNodes(surplusActiveNodes); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java index 80472487b2d..0885b941401 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java @@ -19,7 +19,6 @@ import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Agent; import com.yahoo.vespa.hosted.provision.node.Status; -import com.yahoo.vespa.hosted.provision.provisioning.NodePrioritizer; import com.yahoo.vespa.hosted.provision.provisioning.NodeRepositoryProvisioner; import java.time.Clock; @@ -59,13 +58,9 @@ public class MockNodeRepository extends NodeRepository { private void populate() { NodeRepositoryProvisioner provisioner = new NodeRepositoryProvisioner(this, flavors, Zone.defaultZone()); - NodePrioritizer.unitTesting = true; + List<Node> nodes = new ArrayList<>(); - MockNameResolver nameResolver = (MockNameResolver)nameResolver(); - nameResolver.addRecord("docker-node-1", "::2"); - nameResolver.addRecord("docker-node-2", "::3"); - nameResolver.addRecord("docker-node-3", "::4"); final List<String> ipAddressesForAllHost = Arrays.asList("127.0.0.1", "::1"); Collections.sort(ipAddressesForAllHost); final HashSet<String> ipAddresses = new HashSet<>(ipAddressesForAllHost); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java index 45f73f2fa43..75d5862f010 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java @@ -22,7 +22,6 @@ import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.node.Agent; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import java.time.Instant; @@ -46,11 +45,6 @@ import static org.junit.Assert.fail; */ public class DynamicDockerProvisioningTest { - @Before - public void setup() { - NodePrioritizer.unitTesting = true; - } - /** * Test relocation of nodes that violate headroom. * <p> |