Always activate or remove infrastructure application

1 files changed, 13 insertions, 8 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java
index 6f27888fbfb..85092053bdd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisionerTest.java
@@ -33,8 +33,8 @@ import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 /**
@@ -80,7 +80,7 @@ public class InfrastructureProvisionerTest {
         addNode(1, Node.State.active, Optional.of(target));
         infrastructureProvisioner.maintain();
         verify(duperModelInfraApi).infraApplicationRemoved(application.getApplicationId());
-        verifyNoMoreInteractions(provisioner);
+        verifyRemoved(1);
     }
 
     @Test
@@ -90,11 +90,11 @@ public class InfrastructureProvisionerTest {
         addNode(2, Node.State.parked, Optional.empty());
         infrastructureProvisioner.maintain();
         verify(duperModelInfraApi).infraApplicationRemoved(application.getApplicationId());
-        verifyNoMoreInteractions(provisioner);
+        verifyRemoved(1);
     }
 
     @Test
-    public void no_op_if_nodes_active_and_on_target_version() {
+    public void activate_when_no_op() {
         when(infrastructureVersions.getTargetVersionFor(eq(nodeType))).thenReturn(Optional.of(target));
 
         addNode(1, Node.State.failed, Optional.of(oldVersion));
@@ -107,8 +107,8 @@ public class InfrastructureProvisionerTest {
 
         infrastructureProvisioner.maintain();
         verify(duperModelInfraApi, never()).infraApplicationRemoved(any());
-        verify(duperModelInfraApi, never()).infraApplicationActivated(any(), any());
-        verifyNoMoreInteractions(provisioner);
+        verify(duperModelInfraApi).infraApplicationActivated(any(), any());
+        verify(provisioner).activate(any(), any(), any());
     }
 
     @Test
@@ -196,14 +196,19 @@ public class InfrastructureProvisionerTest {
         when(infrastructureVersions.getTargetVersionFor(eq(nodeType))).thenReturn(Optional.of(target));
 
         infrastructureProvisioner.maintain();
-        verifyNoMoreInteractions(provisioner);
+        verifyRemoved(1);
 
         // Add nodes in non-provisionable states
         addNode(1, Node.State.dirty, Optional.empty());
         addNode(2, Node.State.failed, Optional.empty());
 
         infrastructureProvisioner.maintain();
-        verifyNoMoreInteractions(provisioner);
+        verifyRemoved(2);
+    }
+
+    private void verifyRemoved(int removedCount) {
+        verify(provisioner, times(removedCount)).remove(any(), any());
+        verify(duperModelInfraApi, times(removedCount)).infraApplicationRemoved(any());
     }
 
     private Node addNode(int id, Node.State state, Optional<Version> wantedVespaVersion) {