fix agent/rack unit tests

HubSpot · Sep 13, 2021 · 97a3d21 · 97a3d21
1 parent 9a7de55
commit 97a3d21
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/...arityService/src/test/java/com/hubspot/singularity/scheduler/SingularityMachinesTest.java b/...arityService/src/test/java/com/hubspot/singularity/scheduler/SingularityMachinesTest.java
@@ -1343,36 +1343,46 @@ public void testSlavePlacementSeparate() {
   @Test
   public void testAgentPlacementOverride() {
     initRequest();
-    initFirstDeploy();
+    initFirstDeployWithResources(10, 10000);
 
     saveAndSchedule(
       request
         .toBuilder()
-        .setInstances(Optional.of(2))
+        .setInstances(Optional.of(4))
         .setAgentPlacement(Optional.of(AgentPlacement.SEPARATE))
     );
 
     // initially respects separate placement
     sms
       .resourceOffers(
         Arrays.asList(
-          createOffer(20, 20000, 50000, "agent1", "host1"),
-          createOffer(20, 20000, 50000, "agent1", "host1")
+          createOffer(20, 10000, 50000, "agent1", "host1"),
+          createOffer(20, 10000, 50000, "agent1", "host1")
         )
       )
       .join();
 
-    Assertions.assertTrue(taskManager.getPendingTaskIds().size() == 1);
+    Assertions.assertTrue(taskManager.getPendingTaskIds().size() == 3);
     Assertions.assertTrue(taskManager.getActiveTaskIds().size() == 1);
 
     // with override, ignores request placement strategy
+    // note - if we ever bother parallelizing the tests this'll cause issues with other placement tests
     overrides.setAgentPlacementOverride(Optional.of(AgentPlacement.GREEDY));
     sms
       .resourceOffers(Arrays.asList(createOffer(20, 20000, 50000, "agent1", "host1")))
       .join();
 
-    Assertions.assertTrue(taskManager.getPendingTaskIds().size() == 0);
-    Assertions.assertTrue(taskManager.getActiveTaskIds().size() == 2);
+    Assertions.assertTrue(taskManager.getPendingTaskIds().size() == 1);
+    Assertions.assertTrue(taskManager.getActiveTaskIds().size() == 3);
+
+    // without override, respects request placement strategy but leaves running tasks
+    overrides.setAgentPlacementOverride(Optional.empty());
+    sms
+      .resourceOffers(Arrays.asList(createOffer(20, 20000, 50000, "agent1", "host1")))
+      .join();
+
+    Assertions.assertTrue(taskManager.getPendingTaskIds().size() == 1);
+    Assertions.assertTrue(taskManager.getActiveTaskIds().size() == 3);
   }
 
   @Test
@@ -2064,6 +2074,15 @@ public void testRackSensitiveOverride() {
       )
       .join();
     Assertions.assertEquals(6, taskManager.getActiveTaskIds().size());
+
+    // without the override, rack1 should not get another instance
+    overrides.setAllowRackSensitivity(true);
+    sms
+      .resourceOffers(
+        Arrays.asList(createOffer(1, 128, 1024, "agent1", "host1", Optional.of("rack1")))
+      )
+      .join();
+    Assertions.assertEquals(6, taskManager.getActiveTaskIds().size());
   }
 
   @Test