summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2018-05-23 14:03:37 +0200
committerGitHub <noreply@github.com>2018-05-23 14:03:37 +0200
commitd3417a2cc400c0d64b71e1cc91fcc032bb8fb3a9 (patch)
tree935113a5231143c3a207a878f7798c658316ec41
parent129dd211b4b138c6ce15498bd76cd535fe7177a7 (diff)
parent542e437cabfc6c11a204a22d8803a50cb883ea9c (diff)
Merge pull request #5917 from vespa-engine/hmusum/remove-useless-test
Remove useless test
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java26
1 files changed, 0 insertions, 26 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 42c2d8db968..9a4b0b05186 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -128,32 +128,6 @@ public class TenantRepositoryTest extends TestWithCurator {
}
@Test
- public void testTenantsChanged() {
- tenantRepository.close(); // Close the repo created in setup()
- TenantRepository tenantRepository = new TenantRepository(globalComponentRegistry);
- tenantRepository.addTenant(tenant2);
- tenantRepository.createTenants();
- Set<TenantName> allTenants = tenantRepository.getAllTenantNames();
- assertTrue(allTenants.contains(tenant2));
- tenantRepository.deleteTenant(tenant1);
- tenantRepository.deleteTenant(tenant2);
- tenantRepository.createTenants();
- allTenants = tenantRepository.getAllTenantNames();
- assertFalse(allTenants.contains(tenant1));
- assertFalse(allTenants.contains(tenant2));
- TenantName foo = TenantName.from("foo");
- TenantName bar = TenantName.from("bar");
- tenantRepository.addTenant(tenant2);
- tenantRepository.addTenant(foo);
- tenantRepository.addTenant(bar);
- tenantRepository.createTenants();
- allTenants = tenantRepository.getAllTenantNames();
- assertTrue(allTenants.contains(tenant2));
- assertTrue(allTenants.contains(foo));
- assertTrue(allTenants.contains(bar));
- }
-
- @Test
public void testTenantWatching() throws Exception {
TenantName newTenant = TenantName.from("newTenant");
List<TenantName> expectedTenants = Arrays.asList(TenantName.defaultName(), newTenant);