only require the warning we actually want to check

1 files changed, 11 insertions, 3 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index 9eb7ca0ac02..8673d862ac8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -316,10 +316,18 @@ public class VespaModelTestCase {
                 .build();
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
         Validation.validate(model, new ValidationParameters(), deployState);
+        assertContainsWarning(logger.msgs, "Directory searchdefinitions/ should not be used for schemas, use schemas/ instead");
+    }
 
-        assertEquals(3, logger.msgs.size());
-        assertEquals("WARNING", logger.msgs.get(1).getFirst().getName());
-        assertEquals("Directory searchdefinitions/ should not be used for schemas, use schemas/ instead", logger.msgs.get(1).getSecond());
+    private void assertContainsWarning(List<Pair<Level,String>> msgs, String text) {
+        boolean foundCorrectWarning = false;
+        for (var msg : msgs)
+            if (msg.getFirst().getName().equals("WARNING") && msg.getSecond().equals(text)) {
+                foundCorrectWarning = true;
+            }
+        if (! foundCorrectWarning) for (var msg : msgs) System.err.println("MSG: "+msg);
+        assertTrue(msgs.size() > 0);
+        assertTrue(foundCorrectWarning);
     }
 
 }