diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-05-28 08:30:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-28 08:30:37 +0200 |
commit | 0f2dbc91395a97d471d8e81adee6628bd062dc13 (patch) | |
tree | fda6718eba69dda1eb70cfbc508c6cefe39a5c1b /configserver | |
parent | 65f34301a54f12090bb0fd425e2c2e144fc7efe4 (diff) | |
parent | 8e9a27d25473e1e60fab97b0cd4ddb316105d6af (diff) |
Merge pull request #9578 from vespa-engine/hmusum/ignore-deployment-xml-in-unit-tests
Ignore deployment.xml in some contexts (e.g. unit tests)
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index 0e124addaf7..395c1ecb80b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -110,7 +110,7 @@ public class LbServicesProducerTest { Zone zone = new Zone(Environment.prod, regionName); Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder() .zone(zone) - .properties(new TestProperties())); + .properties(new TestProperties().setHostedVespa(true))); return getLbServicesConfig(new Zone(Environment.prod, regionName), testModel); } @@ -123,7 +123,9 @@ public class LbServicesProducerTest { @Test public void testConfigAliasesWithRotations() throws IOException, SAXException { - Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder().rotations(rotations)); + Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder() + .rotations(rotations) + .properties(new TestProperties().setHostedVespa(true))); RegionName regionName = RegionName.from("us-east-1"); LbServicesConfig conf = getLbServicesConfig(new Zone(Environment.prod, regionName), testModel); final LbServicesConfig.Tenants.Applications.Hosts.Services services = conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").hosts("foo.foo.yahoo.com").services(QRSERVER.serviceName); |