cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/master to f331959
Date Sun, 06 Dec 2015 19:19:42 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 638f1cf09 -> f33195915


CLOUDSTACK-8656: tests ignoring exceptions


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52037e88
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52037e88
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52037e88

Branch: refs/heads/master
Commit: 52037e88e4b8de3368227565f45ae4c816d35adc
Parents: ea7c2d9
Author: Daan Hoogland <daan@onecht.net>
Authored: Fri Sep 18 12:23:33 2015 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Nov 16 18:36:24 2015 +0100

----------------------------------------------------------------------
 server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52037e88/server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java b/server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java
index 3102c9a..f60044e 100644
--- a/server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java
+++ b/server/test/com/cloud/ha/HighAvailabilityManagerImplTest.java
@@ -33,6 +33,7 @@ import javax.inject.Inject;
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContext;
+import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -70,6 +71,7 @@ import com.cloud.vm.dao.VMInstanceDao;
 
 @RunWith(MockitoJUnitRunner.class)
 public class HighAvailabilityManagerImplTest {
+    private static final Logger s_logger = Logger.getLogger(HighAvailabilityManagerImplTest.class);
     @Mock
     HighAvailabilityDao _haDao;
     @Mock
@@ -121,6 +123,7 @@ public class HighAvailabilityManagerImplTest {
             processWorkMethod = HighAvailabilityManagerImpl.class.getDeclaredMethod("processWork",
HaWorkVO.class);
             processWorkMethod.setAccessible(true);
         } catch (NoSuchMethodException e) {
+            s_logger.info("[ignored] expected NoSuchMethodException caught: " + e.getLocalizedMessage());
         }
     }
 
@@ -230,8 +233,11 @@ public class HighAvailabilityManagerImplTest {
         try {
             processWorkMethod.invoke(highAvailabilityManagerSpy, work);
         } catch (IllegalAccessException e) {
+            s_logger.info("[ignored] expected IllegalAccessException caught: " + e.getLocalizedMessage());
         } catch (IllegalArgumentException e) {
+            s_logger.info("[ignored] expected IllegalArgumentException caught: " + e.getLocalizedMessage());
         } catch (InvocationTargetException e) {
+            s_logger.info("[ignored] expected InvocationTargetException caught: " + e.getLocalizedMessage());
         }
         assertTrue(work.getStep() == expectedStep);
     }


Mime
View raw message