summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-11-29 15:22:22 +0100
committerGitHub <noreply@github.com>2017-11-29 15:22:22 +0100
commitfc8f7f3dcfc8b69a84ccd5657de8c0bdde5f9f3f (patch)
tree37b1b0734e5803d4ea19fca02c71dfc5b11f18b8
parent3c5a29c5fd4bcf88d8c8bfa651f99a63d5e3ba2c (diff)
parentda046361a684b9e6ef4c2cf3fe209ee0e30ba15b (diff)
Merge pull request #4306 from vespa-engine/hmusum/do-not-assume-anything-about-default-tenant
Do not assume anything about the default teanant, it is no longer
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantsTestCase.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantsTestCase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantsTestCase.java
index e650997b7e0..617ad8733f9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantsTestCase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantsTestCase.java
@@ -125,13 +125,10 @@ public class TenantsTestCase extends TestWithCurator {
public void testTenantsChanged() throws Exception {
tenants.close(); // close the Tenants instance created in setupSession, we do not want to use one with a PatchChildrenCache listener
tenants = new Tenants(globalComponentRegistry, new ArrayList<>());
- TenantName defaultTenant = TenantName.defaultName();
tenants.addTenant(tenant2);
tenants.createTenants();
Set<TenantName> allTenants = tenants.getAllTenantNames();
assertTrue(allTenants.contains(tenant2));
- assertEquals("default", defaultTenant.value());
- assertTrue(allTenants.contains(defaultTenant));
tenants.deleteTenant(tenant1);
tenants.deleteTenant(tenant2);
tenants.createTenants();