From 0477084b81811a66992f5a33bec8fe6c02f195ea Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 13 Nov 2017 11:53:09 +0100 Subject: No longer necessary to loop as no more deletion of default tenant will take place. --- .../com/yahoo/vespa/config/server/deploy/DeployTester.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'configserver') diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java index 557a4332ef5..d9a0db7e811 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java @@ -103,15 +103,7 @@ public class DeployTester { } public Tenant tenant() { - Tenant tenant = tenants.defaultTenant(); - // TODO Retry since there is some code removing/updating the default tenant which should not be done. - while (tenant == null) { - try { - Thread.sleep(1); - } catch (InterruptedException e) {} - tenant = tenants.defaultTenant(); - } - return tenant; + return tenants.defaultTenant(); } /** Create a model factory for the version of this source*/ -- cgit v1.2.3