mirror of https://github.com/apache/cloudstack.git
network-refactor: unfortunately have to ignore tests during build since the tests involve verification of injection. This causes the database to get invoked during component initialization. The database is not available on the build server
This commit is contained in:
parent
1776659fe7
commit
7fad27b846
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue