Merge pull request #18 from daniel-beck/JENKINS-34530

[FIX JENKINS-34530] Make test harness work for 2.x based plugins
jenkinsci · May 4, 2016 · 1f72558 · 1f72558
2 parents acf3d37 + d29aea5
commit 1f72558
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/org/jvnet/hudson/test/TestPluginManager.java b/src/main/java/org/jvnet/hudson/test/TestPluginManager.java
@@ -82,15 +82,15 @@ private Set<String> loadBundledPlugins(File fromDir) throws IOException, URISynt
         Set<String> names = new HashSet<String>();
 
         File[] children = fromDir.listFiles();
-        if (children==null)
-            throw new Error("Unable to find "+fromDir);
-        for (File child : children) {
-            try {
-                names.add(child.getName());
-
-                copyBundledPlugin(child.toURI().toURL(), child.getName());
-            } catch (IOException e) {
-                LOGGER.log(Level.SEVERE, "Failed to extract the bundled plugin "+child,e);
+        if (children!=null) {
+            for (File child : children) {
+                try {
+                    names.add(child.getName());
+
+                    copyBundledPlugin(child.toURI().toURL(), child.getName());
+                } catch (IOException e) {
+                    LOGGER.log(Level.SEVERE, "Failed to extract the bundled plugin "+child,e);
+                }
             }
         }
         // If running tests for a plugin, include the plugin being tested