From b97dca385e3cb3c20ad72b9091c502b4977aedeb Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 3 Feb 2017 10:21:28 +0100 Subject: [PATCH] Improve the SFT log for features.xml/feature.xml Instead of logging an error when features.xml or feature.xml aren't found, check whether we find any test children and log an error if there aren't any globally. Change-Id: I21fe04911cbf350b33c28e2fcb79422f631c6ac4 Signed-off-by: Stephen Kitt --- .../odlparent/featuretest/PerRepoTestRunner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java b/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java index eea226a5f..b44ef8324 100644 --- a/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java +++ b/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java @@ -11,6 +11,7 @@ package org.opendaylight.odlparent.featuretest; import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.xml.bind.JAXBException; import org.apache.karaf.features.internal.model.Feature; @@ -56,10 +57,11 @@ public class PerRepoTestRunner extends ParentRunner { final boolean recursive = Boolean.getBoolean(REPO_RECURSE); LOG.info("Creating test runners for repoUrl {} recursive {}", repoUrl, recursive); children.addAll(runnersFromRepoUrl(repoUrl, testClass, recursive)); - } else { - LOG.error("getClass().getClassLoader().getResource(\"{}\") returned null", filename); } } + if (children.isEmpty()) { + LOG.error("No features found to test; looked for {}", Arrays.toString(FEATURES_FILENAMES)); + } } catch (final IOException | JAXBException e) { throw new InitializationError(e); } -- 2.36.6