skip test in cloud engine
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e4e2cf6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e4e2cf6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e4e2cf6b Branch: refs/heads/javelin Commit: e4e2cf6be78611cb259d7cdd530eb613ce1dcd7a Parents: c921118 Author: Edison Su <edison...@citrix.com> Authored: Tue Jan 22 13:23:45 2013 -0800 Committer: Edison Su <edison...@citrix.com> Committed: Tue Jan 22 13:25:48 2013 -0800 ---------------------------------------------------------------------- engine/orchestration/pom.xml | 16 +++++++++++++++ engine/storage/integration-test/pom.xml | 3 ++ engine/storage/volume/pom.xml | 16 +++++++++++++++ plugins/storage/volume/solidfire/pom.xml | 16 +++++++++++++++ .../apache/cloudstack/storage/test/VolumeTest.java | 2 +- 5 files changed, 52 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4e2cf6b/engine/orchestration/pom.xml ---------------------------------------------------------------------- diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml index 5e2495e..95426ea 100755 --- a/engine/orchestration/pom.xml +++ b/engine/orchestration/pom.xml @@ -68,5 +68,21 @@ <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4e2cf6b/engine/storage/integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index fae9e9c..782bc7d 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -107,6 +107,9 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> <executions> <execution> <phase>integration-test</phase> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4e2cf6b/engine/storage/volume/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml index a5db9e8..e424cab 100644 --- a/engine/storage/volume/pom.xml +++ b/engine/storage/volume/pom.xml @@ -46,5 +46,21 @@ <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4e2cf6b/plugins/storage/volume/solidfire/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index e3da9ea..cbbc54c 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -36,5 +36,21 @@ <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4e2cf6b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java index 20cb8fb..6f0b2e7 100644 --- a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java +++ b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java @@ -112,7 +112,7 @@ public class VolumeTest { results.add(host); Mockito.when(hostDao.listAll()).thenReturn(results); Mockito.when(hostDao.findHypervisorHostInCluster(Mockito.anyLong())).thenReturn(results); - CreateObjectAnswer createVolumeFromImageAnswer = new CreateObjectAnswer(null,UUID.randomUUID().toString()); + CreateObjectAnswer createVolumeFromImageAnswer = new CreateObjectAnswer(null,UUID.randomUUID().toString(), null); try { Mockito.when(agentMgr.send(Mockito.anyLong(), Mockito.any(CreateVolumeFromBaseImageCommand.class))).thenReturn(createVolumeFromImageAnswer);
