diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-11-09 11:15:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 11:15:13 +0100 |
commit | 3143f748bbe39f480f44611bb814a2387983f913 (patch) | |
tree | 43885c681901ad73bb6c933b521159dad4f8eda2 /configserver | |
parent | 1d82032fbc9c51f3976c50823361b8d582058fa9 (diff) | |
parent | 36a10b2b78d2739850346293f7535bad9fb24f8e (diff) |
Merge pull request #4057 from vespa-engine/hmusum/use-already-created-instance
Use Tenants already created in @Before
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantsTestCase.java | 10 |
1 files changed, 4 insertions, 6 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 5802edfad36..59dec6946f9 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 @@ -146,25 +146,23 @@ public class TenantsTestCase extends TestWithCurator { @Test public void testTenantWatching() throws Exception { - TestComponentRegistry reg = new TestComponentRegistry.Builder().curator(curator).build(); - Tenants t = new Tenants(reg, Metrics.createTestMetrics()); TenantName newTenant = TenantName.from("newTenant"); List<TenantName> expectedTenants = Arrays.asList(TenantName.defaultName(), newTenant); try { - t.addTenant(newTenant); + tenants.addTenant(newTenant); // Poll for the watcher to pick up the tenant from zk, and add it int tries=0; while(true) { if (tries > 5000) fail("Didn't react on watch"); - if (t.getAllTenantNames().containsAll(expectedTenants)) { + if (tenants.getAllTenantNames().containsAll(expectedTenants)) { break; } tries++; Thread.sleep(10); } } finally { - assertTrue(t.getAllTenantNames().containsAll(expectedTenants)); - t.close(); + assertTrue(tenants.getAllTenantNames().containsAll(expectedTenants)); + tenants.close(); } } |