summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-04-07 13:11:49 +0200
committerGitHub <noreply@github.com>2017-04-07 13:11:49 +0200
commitbde2604037eee583a9e1d21e0f2c352f206816c6 (patch)
tree5aef61697dc0aaf7a867784b59b410e7cad9c44e /node-repository
parentfc61c8f114f2d1dd7938afd6831a9f1c0a05e8e1 (diff)
parentaeacb51b8c54b0cc5685983b56510b190efb8158 (diff)
Merge pull request #2167 from yahoo/gjoranv/add-flavor-to-zk-app
Gjoranv/add flavor to zk app
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index a12d77ecbd5..d89541daebb 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -12,6 +12,7 @@ import com.yahoo.config.provision.Flavor;
import com.yahoo.config.provision.HostFilter;
import com.yahoo.config.provision.HostSpec;
import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.NodeFlavors;
import com.yahoo.config.provision.OutOfCapacityException;
import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.TenantName;
@@ -238,7 +239,8 @@ public class ProvisioningTest {
config.defaultFlavor("not-used");
config.defaultContainerFlavor("small");
config.defaultContentFlavor("large");
- ProvisioningTester tester = new ProvisioningTester(new Zone(new ConfigserverConfig(config)));
+ ProvisioningTester tester = new ProvisioningTester(new Zone(new ConfigserverConfig(config),
+ new NodeFlavors(new FlavorsConfig(new FlavorsConfig.Builder()))));
ApplicationId application1 = tester.makeApplicationId();