ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ttho...@apache.org
Subject ambari git commit: AMBARI-18051 - Services should be able to provide their own pre-req checks by supplying a jar file
Date Wed, 28 Sep 2016 18:29:49 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 592a9ef45 -> 5890d324a


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/5890d324
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5890d324
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5890d324

Branch: refs/heads/branch-2.4
Commit: 5890d324adb836b0052a2c0cc071d992e52c8a96
Parents: 592a9ef
Author: Tim Thorpe <tthorpe@apache.org>
Authored: Wed Sep 28 11:28:29 2016 -0700
Committer: Tim Thorpe <tthorpe@apache.org>
Committed: Wed Sep 28 11:28:29 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/5890d324/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 687d263..edaa4e3 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;


Mime
View raw message