Revert deferred ZK connectivity for now

Instead, we'll want to create a more generalized solution that considers
all sources of node information (Slobrok _and_ explicit health check RPCs)
before potentially publishing a state or processing tasks.

1 files changed, 1 insertions, 12 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
index 7f664e65dc0..f6add77423a 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseHandlerTest.java
@@ -66,22 +66,11 @@ public class DatabaseHandlerTest {
         }
 
         DatabaseHandler createHandler() throws Exception {
-            var handler = new DatabaseHandler(mockDbFactory, mockTimer, databaseAddress, 0, monitor);
-            handler.setConnectionEstablishmentIsAllowed(true);
-            return handler;
+            return new DatabaseHandler(mockDbFactory, mockTimer, databaseAddress, 0, monitor);
         }
     }
 
     @Test
-    public void can_not_connect_to_database_if_connectivity_is_not_allowed() throws Exception {
-        Fixture f = new Fixture();
-        DatabaseHandler handler = f.createHandler();
-        handler.setConnectionEstablishmentIsAllowed(false);
-        handler.doNextZooKeeperTask(f.createMockContext());
-        assertTrue(handler.isClosed()); // No connectivity allowed yet
-    }
-
-    @Test
     public void can_store_latest_cluster_state_bundle() throws Exception {
         Fixture f = new Fixture();
         DatabaseHandler handler = f.createHandler();