No longer necessary to loop as no more deletion of default tenant will take place.

1 files changed, 1 insertions, 9 deletions

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*/