Merge pull request #5886 from vespa-engine/hmusum/make-test-robust

Make test more robust, close unused tenant repo

1 files changed, 2 insertions, 1 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 3598af57593..42c2d8db968 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
@@ -129,7 +129,8 @@ public class TenantRepositoryTest extends TestWithCurator {
     
     @Test
     public void testTenantsChanged() {
-        tenantRepository = new TenantRepository(globalComponentRegistry);
+        tenantRepository.close(); // Close the repo created in setup()
+        TenantRepository tenantRepository = new TenantRepository(globalComponentRegistry);
         tenantRepository.addTenant(tenant2);
         tenantRepository.createTenants();
         Set<TenantName> allTenants = tenantRepository.getAllTenantNames();