Skip to content

Commit 91a27df

Browse files
committed
skip tests conditionally
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent aaadbb6 commit 91a27df

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

plugins/hypervisors/kvm/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,6 @@
107107
</execution>
108108
</executions>
109109
</plugin>
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-surefire-plugin</artifactId>
113-
<configuration>
114-
<excludes>
115-
<exclude>**/QemuImg*.java</exclude>
116-
</excludes>
117-
</configuration>
118-
</plugin>
119110
</plugins>
120111
</build>
121112
<profiles>

plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@
3434
import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
3535
import org.apache.commons.collections.MapUtils;
3636
import org.junit.Assert;
37+
import org.junit.Assume;
38+
import org.junit.BeforeClass;
3739
import org.junit.Ignore;
3840
import org.junit.Test;
3941
import org.junit.runner.RunWith;
42+
import org.libvirt.Connect;
4043
import org.libvirt.LibvirtException;
4144
import org.mockito.Mockito;
4245
import org.mockito.junit.MockitoJUnitRunner;
@@ -46,6 +49,18 @@
4649
@RunWith(MockitoJUnitRunner.class)
4750
public class QemuImgTest {
4851

52+
@BeforeClass
53+
public static void setUp() {
54+
Assume.assumeTrue("qemu-img not found", Script.runSimpleBashScript("command -v qemu-img") != null);
55+
boolean libVirtAvailable = false;
56+
try {
57+
Connect conn = new Connect("qemu:///system", false);
58+
conn.getVersion();
59+
libVirtAvailable = true;
60+
} catch (LibvirtException ignored) {}
61+
Assume.assumeTrue("libvirt not available", libVirtAvailable);
62+
}
63+
4964
@Test
5065
public void testCreateAndInfo() throws QemuImgException, LibvirtException {
5166
String filename = "/tmp/" + UUID.randomUUID() + ".qcow2";

0 commit comments

Comments
 (0)