[TEST] fix test to only enforce settings if it's not negative AND less than the limit

2016-02-22 10:50:00 -08:00 · 2016-02-22 10:50:00 -08:00 · a574baaf3e
parent 35ae8263af
commit a574baaf3e
1 changed files with 1 additions and 1 deletions
--- a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java
@ -43,7 +43,7 @@ public class BootstrapSettingsTests extends ESTestCase {
        long maxFileDescriptorCount = ProcessProbe.getInstance().getMaxFileDescriptorCount();
        try {
            Bootstrap.enforceOrLogLimits(build);
-            if (maxFileDescriptorCount != -1 || maxFileDescriptorCount < (1 << 16)) {
+            if (maxFileDescriptorCount != -1 && maxFileDescriptorCount < (1 << 16)) {
                fail("must have enforced limits: " + maxFileDescriptorCount);
            }
        } catch (IllegalStateException ex) {