Fix unit test, revert behavior as before

Author: VietND96

java/src/org/openqa/selenium/grid/data/NodeStatus.java

@@ -139,20 +139,17 @@ public static NodeStatus fromJson(JsonInput input) {
   }
 
   public boolean hasCapability(Capabilities caps, SlotMatcher slotMatcher) {
-    return this.getAvailability() == Availability.UP
-        && slots.stream().anyMatch(slot -> slot.isSupporting(caps, slotMatcher));
+    return slots.stream().anyMatch(slot -> slot.isSupporting(caps, slotMatcher));
   }
 
   public boolean hasCapacity() {
-    return this.getAvailability() == Availability.UP
-        && slots.stream().filter(slot -> slot.getSession() != null).count() < maxSessionCount;
+    return slots.stream().filter(slot -> slot.getSession() != null).count() < maxSessionCount;
   }
 
   // Check if the Node's max session limit is not exceeded and has a free slot that supports the
   // capability.
   public boolean hasCapacity(Capabilities caps, SlotMatcher slotMatcher) {
-    return this.getAvailability() == Availability.UP
-        && slots.stream().filter(slot -> slot.getSession() != null).count() < maxSessionCount
+    return slots.stream().filter(slot -> slot.getSession() != null).count() < maxSessionCount
         && slots.stream()
             .anyMatch(slot -> slot.getSession() == null && slot.isSupporting(caps, slotMatcher));
   }

java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java

@@ -704,7 +704,8 @@ private SlotId reserveSlot(RequestId requestId, Capabilities caps) {
   }
 
   private boolean isNotSupported(Capabilities caps) {
-    return getAvailableNodes().stream().noneMatch(node -> node.hasCapability(caps, slotMatcher));
+    return getAvailableNodes().stream()
+        .noneMatch(node -> node.hasCapability(caps, slotMatcher) && node.getAvailability() == UP);
   }
 
   private boolean reserve(SlotId id) {
@@ -794,7 +795,7 @@ public void run() {
         // up starving a session request.
         Map<Capabilities, Long> stereotypes =
             getAvailableNodes().stream()
-                .filter(NodeStatus::hasCapacity)
+                .filter(node -> node.hasCapacity() && node.getAvailability() == UP)
                 .flatMap(node -> node.getSlots().stream().map(Slot::getStereotype))
                 .collect(
                     Collectors.groupingBy(ImmutableCapabilities::copyOf, Collectors.counting()));

java/src/org/openqa/selenium/grid/distributor/selector/DefaultSlotSelector.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.grid.distributor.selector;
 
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
+import static org.openqa.selenium.grid.data.Availability.UP;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.util.Comparator;
@@ -48,7 +49,7 @@ public Set<SlotId> selectSlot(
     // Nodes).
     // After that, Nodes are ordered by their load, last session creation, and their id.
     return nodes.stream()
-        .filter(node -> node.hasCapacity(capabilities, slotMatcher))
+        .filter(node -> node.hasCapacity(capabilities, slotMatcher) && node.getAvailability() == UP)
         .sorted(
             Comparator.comparingLong(this::getNumberOfSupportedBrowsers)
                 // Now sort by node which has the lowest load (natural ordering)