- Rewrite tests to avoid depending on a empty content cluster not requiring a docproc cluster.

- Empty content cluster serves no purpose.

1 files changed, 1 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index c8f088509c5..befe57a97e4 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -13,7 +13,6 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeResources;
-import com.yahoo.config.provision.NodeResources.DiskSpeed;
 import com.yahoo.config.provision.ProvisionLogger;
 
 import java.util.ArrayList;
@@ -310,9 +309,7 @@ public class InMemoryProvisioner implements HostProvisioner {
             if (a.memoryGb() < b.memoryGb()) return -1;
             if (a.diskGb() > b.diskGb()) return 1;
             if (a.diskGb() < b.diskGb()) return -1;
-            if (a.vcpu() > b.vcpu()) return 1;
-            if (a.vcpu() < b.vcpu()) return -1;
-            return 0;
+            return Double.compare(a.vcpu(), b.vcpu());
         }
     }