Updated Branches: refs/heads/master e5c542aaf -> 993afdba6
ignore the tests looking for db These tests require DB to be present to do upgrade. Revisit later. Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/993afdba Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/993afdba Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/993afdba Branch: refs/heads/master Commit: 993afdba6aa44ca83c618db8f410399f1cf22892 Parents: e5c542a Author: Prasanna Santhanam <[email protected]> Authored: Fri Mar 1 11:20:36 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Fri Mar 1 12:04:06 2013 +0530 ---------------------------------------------------------------------- server/pom.xml | 26 ++++++++++++++- server/test/com/cloud/upgrade/DbUpgrade22Test.java | 2 + 2 files changed, 27 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/993afdba/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index ab43c9c..b39f731 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -106,16 +106,40 @@ <testResources> <testResource> <directory>test/resources</directory> + <excludes> + <exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude> + </excludes> </testResource> </testResources> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>default-testCompile</id> + <phase>test-compile</phase> + <configuration> + <testExcludes> + <exclude>**/com/cloud/upgrade/*.java</exclude> + <exclude>**/com/cloud/async/*.java</exclude> + </testExcludes> + </configuration> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>-Xmx1024m</argLine> <excludes> - <exclude>com/cloud/upgrade/*</exclude> + <exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude> + <exclude>com/cloud/upgrade/AdvanceZone223To224UpgradeTest</exclude> + <exclude>com/cloud/upgrade/AdvanceZone217To224UpgradeTest</exclude> <exclude>com/cloud/async/*</exclude> <exclude>com/cloud/cluster/*</exclude> <exclude>com/cloud/snapshot/*</exclude> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/993afdba/server/test/com/cloud/upgrade/DbUpgrade22Test.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/upgrade/DbUpgrade22Test.java b/server/test/com/cloud/upgrade/DbUpgrade22Test.java index 2718ff2..e0db82d 100644 --- a/server/test/com/cloud/upgrade/DbUpgrade22Test.java +++ b/server/test/com/cloud/upgrade/DbUpgrade22Test.java @@ -16,12 +16,14 @@ // under the License. package com.cloud.upgrade; +import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ AdvanceZone217To224UpgradeTest.class, AdvanceZone223To224UpgradeTest.class, PortForwarding218To224UpgradeTest.class, InstanceGroup218To224UpgradeTest.class, BasicZone218To224UpgradeTest.class, UsageEvents218To224UpgradeTest.class }) +@Ignore("maven-sure-fire discovered") public class DbUpgrade22Test { }
