AMBARI-18051 - Services should be able to provide their own pre-req checks by supplying a jar file
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/26425953 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26425953 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26425953 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 26425953175f1167a7040b5c37985eee8724bb28 Parents: 84ecbb4 Author: Tim Thorpe <[email protected]> Authored: Wed Sep 28 11:33:21 2016 -0700 Committer: Tim Thorpe <[email protected]> Committed: Wed Sep 28 11:33:21 2016 -0700 ---------------------------------------------------------------------- .../org/apache/ambari/server/checks/UpgradeCheckOrderTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/26425953/ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeCheckOrderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeCheckOrderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeCheckOrderTest.java index cb03613..c7b4a79 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeCheckOrderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/UpgradeCheckOrderTest.java @@ -69,8 +69,10 @@ public class UpgradeCheckOrderTest { AssignableTypeFilter filter = new AssignableTypeFilter(AbstractCheckDescriptor.class); scanner.addIncludeFilter(filter); + // grab all check subclasses using the exact folder they are in to avoid loading the SampleServiceCheck from the test jar + Set<BeanDefinition> beanDefinitions = scanner.findCandidateComponents("org.apache.ambari.server.checks"); + // verify they are equal - Set<BeanDefinition> beanDefinitions = scanner.findCandidateComponents("org.apache.ambari.server"); Assert.assertEquals(beanDefinitions.size(), checks.size()); AbstractCheckDescriptor lastCheck = null;
