diff --git a/server/test/com/cloud/network/NetworkManagerTest.java b/server/test/com/cloud/network/NetworkManagerTest.java index c0856d649ff..c7d2a076c94 100644 --- a/server/test/com/cloud/network/NetworkManagerTest.java +++ b/server/test/com/cloud/network/NetworkManagerTest.java @@ -21,6 +21,8 @@ package com.cloud.network; import junit.framework.Assert; import org.apache.log4j.Logger; +import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import com.cloud.network.element.DhcpServiceProvider; @@ -29,10 +31,16 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.testcase.ComponentSetup; import com.cloud.utils.testcase.ComponentTestCase; +@Ignore("Requires database to be set up") @ComponentSetup(managerName="management-server", setupXml="network-mgr-component.xml") public class NetworkManagerTest extends ComponentTestCase { private static final Logger s_logger = Logger.getLogger(NetworkManagerTest.class); - + @Before + @Override + protected void setUp() { + super.setUp(); + } + @Test public void testInjected() { NetworkManagerImpl networkMgr = (NetworkManagerImpl)ComponentLocator.getCurrentLocator().getManager(NetworkManager.class); diff --git a/server/test/com/cloud/network/firewall/FirewallManagerTest.java b/server/test/com/cloud/network/firewall/FirewallManagerTest.java index bb46592a7c7..4fbe8d9aca1 100644 --- a/server/test/com/cloud/network/firewall/FirewallManagerTest.java +++ b/server/test/com/cloud/network/firewall/FirewallManagerTest.java @@ -32,6 +32,7 @@ import junit.framework.Assert; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import com.cloud.exception.ResourceUnavailableException; @@ -56,6 +57,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.testcase.ComponentSetup; import com.cloud.utils.testcase.ComponentTestCase; +@Ignore("Requires database to be set up") @ComponentSetup(managerName="management-server", setupXml="network-mgr-component.xml") public class FirewallManagerTest extends ComponentTestCase { private static final Logger s_logger = Logger.getLogger(FirewallManagerTest.class);